staging: r8188eu: Use kzalloc() with GFP_ATOMIC in atomic context
PATCH 1/1 staging: r8188eu: Use kzalloc() with GFP_ATOMIC in atomic context
Use the GFP_ATOMIC flag of kzalloc() with two memory allocation in rtw_set_key(). This function is called while holding spinlocks and with disabled bottom halves, therefore it is not allowed to sleep. With the GFP_ATOMIC type flag, the allocation is high priority and cannot sleep.
This issue is detected by Smatch which emits the following warning:drivers/staging/r8188eu/core/rtw_pwrctrl.c:79 ips_leave() warn: sleeping in atomic context drivers/staging/r8188eu/core/rtw_pwrctrl.c:81 ips_leave() warn: sleeping in atomic context
The calls chain (in reverse order) is the following:
rtw_set_key()
-> ips_leave()
-> -> rtw_pwr_wakeup()
-> -> -> rtw_set_802_11_disassociate()
The disabilitation of bottom halves and the acquisition of a spinlock is in rtw_set_802_11_disassociate().
After the changes, the post-commit hook output the following messages:
CHECK: Prefer kzalloc(sizeof(*pcmd)...) over kzalloc(sizeof(struct cmd_obj)...)
+ pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
CHECK: Prefer kzalloc(sizeof(*psetkeyparm)...) over kzalloc(sizeof(struct setkey_parm)...)
+ psetkeyparm = kzalloc(sizeof(struct setkey_parm), GFP_ATOMIC).
According to the above "CHECK[S]", use the preferred style in the first kzalloc().
--- drivers/staging/r8188eu/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +2 -2
@@ -1600,12 +1600,12 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, instruct mlme_priv *pmlmepriv = &adapter->mlmepriv;int res = _SUCCESS; - pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL ); + pcmd =kzalloc (sizeof (*pcmd),GFP_ATOMIC );if (!pcmd) { res = _FAIL;/* try again */ goto exit; } - psetkeyparm =kzalloc (sizeof (struct setkey_parm ),GFP_KERNEL ); + psetkeyparm =kzalloc (sizeof (*psetkeyparm),GFP_ATOMIC );if (!psetkeyparm) {kfree (pcmd); res = _FAIL;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerQuoted 43 lines · Fabio M. De Francesco
Use the
GFP_ATOMICflag ofkzalloc()with two memory allocation inrtw_set_key(). This function is called while holding spinlocks and with disabled bottom halves, therefore it is not allowed to sleep. With theGFP_ATOMICtype flag, the allocation is high priority and cannot sleep.This issue is detected by Smatch which emits the following warning:
drivers/staging/r8188eu/core/rtw_pwrctrl.c:79ips_leave()warn: sleeping in atomic contextdrivers/staging/r8188eu/core/rtw_pwrctrl.c:81ips_leave()warn: sleeping in atomic contextThe calls chain (in reverse order) is the following:
rtw_set_key()
->ips_leave()
-> ->rtw_pwr_wakeup()
-> -> ->rtw_set_802_11_disassociate()The disabilitation of bottom halves and the acquisition of a spinlock is in
rtw_set_802_11_disassociate().After the changes, the post-commit hook output the following messages:
CHECK: Prefer kzalloc(sizeof(*pcmd)...) over
kzalloc(sizeof(struct cmd_obj)...)
+ pcmd =kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);CHECK: Prefer kzalloc(sizeof(*psetkeyparm)...) over
kzalloc(sizeof(struct setkey_parm)...)
+ psetkeyparm =kzalloc(sizeof(struct setkey_parm), GFP_ATOMIC).According to the above "CHECK[S]", use the preferred style in the first
kzalloc().Fixes 79f712ea994d ("staging: r8188eu: Remove wrappers for kalloc() and kzalloc()")Fixes 15865124feed ("staging: r8188eu: introduce new core dir for RTL8188eu driver")Signed-off-by Fabio M. De Francesco <[email protected]>--- drivers/staging/r8188eu/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/r8188eu/core/rtw_mlme.c +0
-0@@ -1600,12 +1600,12 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, instruct mlme_priv *pmlmepriv = &adapter->mlmepriv;
drivers/staging/r8188eu/core/rtw_mlme.c int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in · line 1608
Quoted 10 lines
drivers/staging/r8188eu/core/rtw_mlme.c +2
-2int res = _SUCCESS; - pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL ); + pcmd =kzalloc (sizeof (*pcmd),GFP_ATOMIC );if (!pcmd) { res = _FAIL;/* try again */ goto exit; } - psetkeyparm =kzalloc (sizeof (struct setkey_parm ),GFP_KERNEL ); + psetkeyparm =kzalloc (sizeof (*psetkeyparm),GFP_ATOMIC );
You are making two different changes here. Please do the first patch to change the sizeof() change to fix up checkpatch, and then the second one for the GFP_ATOMIC change so that if there is a problem with either of them we can only revert the offending change.
thanks,
greg k-h
Quoted 38 lines · On marted? 8 febbraio 2022 10:33:04 CET Greg Kroah-Hartman wrote:
Quoted 37 lines · Fabio M. De Francesco
Use the
GFP_ATOMICflag ofkzalloc()with two memory allocation inrtw_set_key(). This function is called while holding spinlocks and with disabled bottom halves, therefore it is not allowed to sleep. With theGFP_ATOMICtype flag, the allocation is high priority and cannot sleep.This issue is detected by Smatch which emits the following warning:
drivers/staging/r8188eu/core/rtw_pwrctrl.c:79ips_leave()warn: sleeping in atomic contextdrivers/staging/r8188eu/core/rtw_pwrctrl.c:81ips_leave()warn: sleeping in atomic contextThe calls chain (in reverse order) is the following:
rtw_set_key()
->ips_leave()
-> ->rtw_pwr_wakeup()
-> -> ->rtw_set_802_11_disassociate()The disable of bottom halves and the acquisition of a spinlock is in
rtw_set_802_11_disassociate().After the changes, the post-commit hook output the following messages:
CHECK: Prefer kzalloc(sizeof(*pcmd)...) over
kzalloc(sizeof(struct cmd_obj)...)
+ pcmd =kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);CHECK: Prefer kzalloc(sizeof(*psetkeyparm)...) over
kzalloc(sizeof(struct setkey_parm)...)
+ psetkeyparm =kzalloc(sizeof(struct setkey_parm), GFP_ATOMIC).According to the above "CHECK[S]", use the preferred style in the first
kzalloc().Fixes 79f712ea994d ("staging: r8188eu: Remove wrappers for kalloc() and kzalloc()")Fixes 15865124feed ("staging: r8188eu: introduce new core dir for RTL8188eu driver")Signed-off-by Fabio M. De Francesco <[email protected]>--- drivers/staging/r8188eu/core/rtw_mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 7 lines
Quoted 1 line
[...]
You are making two different changes here. Please do the first patch to change the
sizeof()change to fix up checkpatch, and then the second one for theGFP_ATOMICchange so that if there is a problem with either of them we can only revert the offending change.
OK, thanks for your reply. I'm about to split this patch in two steps as you require.
In the while I've noticed that, after git-reset HARD^, Smatch now points directly to the kzalloc() calls and emits a different output:
"drivers/staging/r8188eu/core/rtw_mlme.c:1603 rtw_set_key() warn: sleeping in atomic context
CHECK drivers/staging/r8188eu/core/rtw_mlme_ext.c".
So now it complains specifically about the first of the two kzalloc[s]() in rtw_set_key(). Before sending v2, I'd like to check why when I made v1 it pointed to the lines that call rtw_set_key(). You'll see that change in the commit message of v2.
Thanks,
Fabio
Quoted 6 lines
thanks,
greg k-h