diff options
| author | Richard Weinberger <richard@nod.at> | 2018-07-01 23:20:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-09 20:07:56 +0200 |
| commit | d6510124f1aca5c958036eeb67d0bd57a277d791 (patch) | |
| tree | f5400831cd38a2e501bfb088a4dad2f1923ecdc4 | |
| parent | 155279d482be4d1171df78d481f171571415a202 (diff) | |
| download | linux-stable-d6510124f1aca5c958036eeb67d0bd57a277d791.tar.gz linux-stable-d6510124f1aca5c958036eeb67d0bd57a277d791.tar.bz2 linux-stable-d6510124f1aca5c958036eeb67d0bd57a277d791.zip | |
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: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ubifs/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 2e169c2932d2..fb166e204441 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -1101,7 +1101,7 @@ static int recomp_data_node(struct ubifs_data_node *dn, int *new_len) 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; |