lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 750/800] staging: rtl8723bs: Fix an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit eb64c6f60ed5406da496cf772fee4b29674bcbb1 ]

    'ret' is known to be 0 at this point. It must be set to -ENOMEM if a
    memory allocation occurs.

    Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/a9533d1594900152e1e64e9f09e54240e3b7062a.1624177169.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
    index 5088c3731b6d..6d0d0beed402 100644
    --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
    +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
    @@ -420,8 +420,10 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
    wep_key_len = wep_key_len <= 5 ? 5 : 13;
    wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
    pwep = kzalloc(wep_total_len, GFP_KERNEL);
    - if (!pwep)
    + if (!pwep) {
    + ret = -ENOMEM;
    goto exit;
    + }

    pwep->KeyLength = wep_key_len;
    pwep->Length = wep_total_len;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:10    [W:4.069 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site