lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 758/879] staging: r8188eu: prevent ->Ssid overflow in rtw_wx_set_scan()
    Date
    From: Denis Efremov <denis.e.efremov@oracle.com>

    commit bc10916e890948d8927a5c8c40fb5dc44be5e1b8 upstream.

    This code has a check to prevent read overflow but it needs another
    check to prevent writing beyond the end of the ->Ssid[] array.

    Fixes: 2b42bd58b321 ("staging: r8188eu: introduce new os_dep dir for RTL8188eu driver")
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Denis Efremov <denis.e.efremov@oracle.com>
    Link: https://lore.kernel.org/r/20220518070052.108287-1-denis.e.efremov@oracle.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
    +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
    @@ -1131,9 +1131,11 @@ static int rtw_wx_set_scan(struct net_de
    break;
    }
    sec_len = *(pos++); len -= 1;
    - if (sec_len > 0 && sec_len <= len) {
    + if (sec_len > 0 &&
    + sec_len <= len &&
    + sec_len <= 32) {
    ssid[ssid_index].SsidLength = sec_len;
    - memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength);
    + memcpy(ssid[ssid_index].Ssid, pos, sec_len);
    ssid_index++;
    }
    pos += sec_len;

    \
     
     \ /
      Last update: 2022-06-08 04:50    [W:4.062 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site