[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-hardening
Subject:    Re: [PATCH] staging: rtl8723bs: Allocate full pwep structure
From:       Dan Carpenter <dan.carpenter () oracle ! com>
Date:       2022-06-20 9:55:00
Message-ID: 20220620095500.GI16517 () kadam
[Download RAW message or body]

On Sat, Jun 18, 2022 at 09:51:36AM +0200, Christophe JAILLET wrote:
> > diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c \
> > b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index ece97e37ac91..30374a820496 \
> >                 100644
> > --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> > +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> > @@ -90,7 +90,8 @@ static int wpa_set_encryption(struct net_device *dev, struct \
> > ieee_param *param,  if (wep_key_len > 0) {
> > 			wep_key_len = wep_key_len <= 5 ? 5 : 13;
> > 			wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, \
> >                 key_material);
> > -			pwep = kzalloc(wep_total_len, GFP_KERNEL);
> > +			/* Allocate a full structure to avoid potentially running off the end. */
> > +			pwep = kzalloc(sizeof(*pwep), GFP_KERNEL);
> > 			if (!pwep) {
> > 				ret = -ENOMEM;
> > 				goto exit;
> > @@ -582,7 +583,8 @@ static int rtw_set_encryption(struct net_device *dev, struct \
> > ieee_param *param,  if (wep_key_len > 0) {
> > 			wep_key_len = wep_key_len <= 5 ? 5 : 13;
> > 			wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, \
> >                 key_material);
> > -			pwep = kzalloc(wep_total_len, GFP_KERNEL);
> > +			/* Allocate a full structure to avoid potentially running off the end. */
> > +			pwep = kzalloc(sizeof(*pwep), GFP_KERNEL);
> > 			if (!pwep)
> 
> Hi,
> 
> while at it (and un-related tyo your patch), I think that 'ret' should also
> be updated here, otherwise we return 0.
> 

Too late.  Smatch does catch that bug btw.

drivers/staging/r8188eu/os_dep/ioctl_linux.c:409 wpa_set_encryption() warn: missing \
error code here? 'kzalloc()' failed. 'ret' = '0'

regards,
dan carpenter


[prev in list] [next in list] [prev in thread] [next in thread]