staging: r8188eu: fix type mismacth
PATCH 1/1 staging: r8188eu: fix type mismacth
smatch says:
rtw_cmd.c:1165 rtw_setassocsta_cmd() warn: struct type mismatch 'set_stakey_rsp vs set_assocsta_rsp'
Since psetassocsta_rsp has struct set_stakey_rsp * type, it looks like copy-paste failure. This error didn't cause any bugs, because sizeof(struct set_assocsta_parm) > sizeof(struct set_stakey_rsp), but there is no reason for allocation extra unused memory
--- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/r8188eu/core/rtw_cmd.c +1 -1
@@ -1162,7 +1162,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) goto exit; } - psetassocsta_rsp =kzalloc (sizeof (struct set_assocsta_rsp ),GFP_ATOMIC ); + psetassocsta_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_ATOMIC );if (!psetassocsta_rsp) {kfree (ph2c);kfree (psetassocsta_para);
Signature · 1 line
2.33.0
Hi Pavel,
drivers/staging/r8188eu/core/rtw_cmd.c u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) · line 1165
Quoted 10 lines · Pavel Skripkin
drivers/staging/r8188eu/core/rtw_cmd.c +1
-1@@ -1162,7 +1162,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) goto exit; } - psetassocsta_rsp =kzalloc (sizeof (struct set_assocsta_rsp ),GFP_ATOMIC ); + psetassocsta_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_ATOMIC );
this should be
psetassocsta_rsp = kzalloc(sizeof(*psetassocsta_rsp), GFP_ATOMIC);
This way you get always the correct size, no matter what's the type of psetassocsta_rsp. Checkpatch suggests this too. ;)
Best regards,
Michael
Quoted 19 lines · Pavel Skripkin
smatch says:
rtw_cmd.c:1165rtw_setassocsta_cmd()warn: struct type mismatch 'set_stakey_rspvsset_assocsta_rsp'Since
psetassocsta_rsphas structset_stakey_rsp* type, it looks like copy-paste failure. This error didn't cause any bugs, becausesizeof(struct set_assocsta_parm)>sizeof(struct set_stakey_rsp), but there is no reason for allocation extra unused memoryFixes 15865124feed ("staging: r8188eu: introduce new core dir for RTL8188eu driver")Signed-off-by Pavel Skripkin <[email protected]>--- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/r8188eu/core/rtw_cmd.c +0
-0
drivers/staging/r8188eu/core/rtw_cmd.c u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) · line 1168
Quoted 8 lines
drivers/staging/r8188eu/core/rtw_cmd.c +1
-1@@ -1162,7 +1162,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) goto exit; } - psetassocsta_rsp =kzalloc (sizeof (struct set_assocsta_rsp ),GFP_ATOMIC ); + psetassocsta_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_ATOMIC );if (!psetassocsta_rsp) {kfree (ph2c);kfree (psetassocsta_para);
I'm not sure this is correct. Might be, might be not. But we use sizeof(struct set_assocsta_rsp) later in the function so it likely leads to memory corruption.
ph2c->rsp = (u8 *)psetassocsta_rsp;
ph2c->rspsz = sizeof(struct set_assocsta_rsp);regards,
dan carpenter
Quoted 33 lines · Dan Carpenter
Quoted 19 lines · Pavel Skripkin
smatch says:
rtw_cmd.c:1165rtw_setassocsta_cmd()warn: struct type mismatch 'set_stakey_rspvsset_assocsta_rsp'Since
psetassocsta_rsphas structset_stakey_rsp* type, it looks like copy-paste failure. This error didn't cause any bugs, becausesizeof(struct set_assocsta_parm)>sizeof(struct set_stakey_rsp), but there is no reason for allocation extra unused memoryFixes 15865124feed ("staging: r8188eu: introduce new core dir for RTL8188eu driver")Signed-off-by Pavel Skripkin <[email protected]>--- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/r8188eu/core/rtw_cmd.c +0
-0drivers/staging/r8188eu/core/rtw_cmd.c u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) · line 1168
Quoted 8 lines
drivers/staging/r8188eu/core/rtw_cmd.c +1
-1@@ -1162,7 +1162,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) goto exit; } - psetassocsta_rsp =kzalloc (sizeof (struct set_assocsta_rsp ),GFP_ATOMIC ); + psetassocsta_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_ATOMIC );if (!psetassocsta_rsp) {kfree (ph2c);kfree (psetassocsta_para);I'm not sure this is correct. Might be, might be not. But we use
sizeof(struct set_assocsta_rsp)later in the function so it likely leads to memory corruption.
Quoted 3 lines
ph2c->rsp = (u8 *)psetassocsta_rsp;
ph2c->rspsz = sizeof(struct set_assocsta_rsp);Hi, Dan!
Unfortunately, this function is unused, so I will just remove it in v2 :)
With regards,
Pavel Skripkin
Greg KH
maintainerQuoted 19 lines · Pavel Skripkin
smatch says:
rtw_cmd.c:1165rtw_setassocsta_cmd()warn: struct type mismatch 'set_stakey_rspvsset_assocsta_rsp'Since
psetassocsta_rsphas structset_stakey_rsp* type, it looks like copy-paste failure. This error didn't cause any bugs, becausesizeof(struct set_assocsta_parm)>sizeof(struct set_stakey_rsp), but there is no reason for allocation extra unused memoryFixes 15865124feed ("staging: r8188eu: introduce new core dir for RTL8188eu driver")Signed-off-by Pavel Skripkin <[email protected]>--- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/r8188eu/core/rtw_cmd.c +0
-0
drivers/staging/r8188eu/core/rtw_cmd.c u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) · line 1165
Quoted 5 lines
drivers/staging/r8188eu/core/rtw_cmd.c +1
-1@@ -1162,7 +1162,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) goto exit; } - psetassocsta_rsp =kzalloc (sizeof (struct set_assocsta_rsp ),GFP_ATOMIC ); + psetassocsta_rsp =kzalloc (sizeof (struct set_stakey_rsp ),GFP_ATOMIC );
Best way to fix this is to use the variable in the call itself, like:
psetassocsta_rsp = kzalloc(sizeof(*psetassocsta_rsp), GFP_ATOMIC);
But as Dan said, this looks odd overall, please make sure that the code is correct here.
thanks,
greg k-h