diff options
author | Silvio Cesare <silvio.cesare@gmail.com> | 2018-05-04 13:44:02 +1000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-03 11:27:03 +0200 |
commit | d49a9fd028016b74f61ebbd98e41cbc899f2df93 (patch) | |
tree | 312502ecb3b310f1694a901d1ea2af2dca54f697 /fs/ubifs | |
parent | 9211df81e8a3a60cb525d995833976f34633f9b8 (diff) | |
download | linux-stable-d49a9fd028016b74f61ebbd98e41cbc899f2df93.tar.gz linux-stable-d49a9fd028016b74f61ebbd98e41cbc899f2df93.tar.bz2 linux-stable-d49a9fd028016b74f61ebbd98e41cbc899f2df93.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>
Diffstat (limited to 'fs/ubifs')
-rw-r--r-- | fs/ubifs/journal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 04c4ec6483e5..8ae1cd8611cc 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -1283,10 +1283,11 @@ static int truncate_data_node(const struct ubifs_info *c, const struct inode *in int *new_len) { void *buf; - int err, dlen, compr_type, out_len, old_dlen; + int err, compr_type; + u32 dlen, out_len, old_dlen; 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; |