summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilvio Cesare <silvio.cesare@gmail.com>2018-05-04 13:44:02 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-03 11:21:32 +0200
commit9c3a27c0ca1ef54b99a24c154dc3b068b3c9ddc3 (patch)
treeabd1971d9b501886f4dacf7d1f3c682a165438d6
parent7cff31473f7e9ffa8f54a3ca59387f329d90e3a9 (diff)
downloadlinux-stable-9c3a27c0ca1ef54b99a24c154dc3b068b3c9ddc3.tar.gz
linux-stable-9c3a27c0ca1ef54b99a24c154dc3b068b3c9ddc3.tar.bz2
linux-stable-9c3a27c0ca1ef54b99a24c154dc3b068b3c9ddc3.zip
UBIFS: Fix potential integer overflow in allocation
commit 353748a359f1821ee934afc579cf04572406b420 upstream. There is potential for the size and len fields in ubifs_data_node to be too large causing either a negative value for the length fields or an integer overflow leading to an incorrect memory allocation. Likewise, when the len field is small, an integer underflow may occur. Signed-off-by: Silvio Cesare <silvio.cesare@gmail.com> Fixes: 1e51764a3c2ac ("UBIFS: add new flash file system") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/ubifs/journal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 0b9da5b6e0f9..22dba8837a86 100644
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -1107,7 +1107,7 @@ static int recomp_data_node(const struct ubifs_info *c,
int err, len, compr_type, out_len;
out_len = le32_to_cpu(dn->size);
- buf = kmalloc(out_len * WORST_COMPR_FACTOR, GFP_NOFS);
+ buf = kmalloc_array(out_len, WORST_COMPR_FACTOR, GFP_NOFS);
if (!buf)
return -ENOMEM;