Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3259dd71 authored by Richard Weinberger's avatar Richard Weinberger Committed by Greg Kroah-Hartman
Browse files

Revert "UBIFS: Fix potential integer overflow in allocation" 



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 <keescook@chromium.org>
Cc: Silvio Cesare <silvio.cesare@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a230db38

fs/ubifs/journal.c

+2 −3
Original line number Diff line number Diff line
@@ -1283,11 +1283,10 @@ static int truncate_data_node(const struct ubifs_info *c, const struct inode *in 
			      int *new_len)

{

	void *buf;

	int err, compr_type;

	u32 dlen, out_len, old_dlen;

	int err, dlen, compr_type, out_len, old_dlen;



	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;