3.18-stable review patch. If anyone has any objections, please let me know.
------------------ From: Richard Weinberger <rich...@nod.at> commit 08acbdd6fd736b90f8d725da5a0de4de2dd6de62 upstream. This reverts commit 353748a359f1821ee934afc579cf04572406b420. It bypassed the linux-mtd review process and fixes the issue not as it should. Cc: Kees Cook <keesc...@chromium.org> Cc: Silvio Cesare <silvio.ces...@gmail.com> Cc: sta...@vger.kernel.org Signed-off-by: Richard Weinberger <rich...@nod.at> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- fs/ubifs/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -1101,7 +1101,7 @@ static int recomp_data_node(struct ubifs int err, len, compr_type, out_len; out_len = le32_to_cpu(dn->size); - buf = kmalloc_array(out_len, WORST_COMPR_FACTOR, GFP_NOFS); + buf = kmalloc(out_len * WORST_COMPR_FACTOR, GFP_NOFS); if (!buf) return -ENOMEM;