lkml.org 
[lkml]   [2018]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 111/157] UBIFS: Fix potential integer overflow in allocation
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Silvio Cesare <silvio.cesare@gmail.com>

    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>

    ---
    fs/ubifs/journal.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/fs/ubifs/journal.c
    +++ b/fs/ubifs/journal.c
    @@ -1283,10 +1283,11 @@ static int truncate_data_node(const stru
    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;


    \
     
     \ /
      Last update: 2018-07-01 19:32    [W:4.188 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site