Skip to contentSkip to conversation

staging: rtl8723bs: use kfree_sensitive() for key material in rtw_set_key()

PATCH In review Ivy Lopez 3 participants 5 messages Jul 30 – Sep 2 Staging

lore
Share & tools
lore

Ivy Lopez

author
#0 lore raw

PATCH 1/1 staging: rtl8723bs: use kfree_sensitive() for key material in rtw_set_key()

psetkeyparm holds WEP/TKIP/AES key material copied in via memcpy from psecuritypriv before being freed. Use kfree_sensitive() instead of kfree() so the key bytes are zeroed before the memory is released, consistent with how psetstakey_para is already handled elsewhere in this driver.

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3
index 1196ec011455..fb45f7295386 100644
@@ -1926,14 +1926,14 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		break;
 	default:
 		res = _FAIL;
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 		goto exit;
 	}
 
 	if (enqueue) {
 		pcmd = kzalloc_obj(*pcmd);
 		if (!pcmd) {
-			kfree(psetkeyparm);
+			kfree_sensitive(psetkeyparm);
 			res = _FAIL;  /* try again */
 			goto exit;
 		}
@@ -1949,7 +1949,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 	} else {
 		setkey_hdl(adapter, (u8 *)psetkeyparm);
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 	}
 exit:
 	return res;
Signature · 1 line
2.55.0
#1 lore raw
Quoted 8 lines · Ivy Lopez

psetkeyparm holds WEP/TKIP/AES key material copied in via memcpy from psecuritypriv before being freed. Use kfree_sensitive() instead of kfree() so the key bytes are zeroed before the memory is released, consistent with how psetstakey_para is already handled elsewhere in this driver.

---

This should have a Fixes tag.

regards,
dan carpenter

author
#2 lore raw

PATCH v2 1/1 staging: rtl8723bs: use kfree_sensitive() for key material in rtw_set_key()

In reply to Ivy Lopez

psetkeyparm holds WEP/TKIP/AES key material copied in via memcpy from psecuritypriv before being freed. Use kfree_sensitive() instead of kfree() so the key bytes are zeroed before the memory is released, consistent with how psetstakey_para is already handled elsewhere in this driver.

Fixes 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3
index 1196ec011455..fb45f7295386 100644
@@ -1926,14 +1926,14 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		break;
 	default:
 		res = _FAIL;
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 		goto exit;
 	}
 
 	if (enqueue) {
 		pcmd = kzalloc_obj(*pcmd);
 		if (!pcmd) {
-			kfree(psetkeyparm);
+			kfree_sensitive(psetkeyparm);
 			res = _FAIL;  /* try again */
 			goto exit;
 		}
@@ -1949,7 +1949,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 	} else {
 		setkey_hdl(adapter, (u8 *)psetkeyparm);
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 	}
 exit:
 	return res;
Signature · 1 line
2.55.0
maintainer
#3 lore raw
Quoted 47 lines · Ivy Lopez

psetkeyparm holds WEP/TKIP/AES key material copied in via memcpy from psecuritypriv before being freed. Use kfree_sensitive() instead of kfree() so the key bytes are zeroed before the memory is released, consistent with how psetstakey_para is already handled elsewhere in this driver.

Fixes 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3
index 1196ec011455..fb45f7295386 100644
@@ -1926,14 +1926,14 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		break;
 	default:
 		res = _FAIL;
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 		goto exit;
 	}
 
 	if (enqueue) {
 		pcmd = kzalloc_obj(*pcmd);
 		if (!pcmd) {
-			kfree(psetkeyparm);
+			kfree_sensitive(psetkeyparm);
 			res = _FAIL;  /* try again */
 			goto exit;
 		}
@@ -1949,7 +1949,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 	} else {
 		setkey_hdl(adapter, (u8 *)psetkeyparm);
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 	}
 exit:
 	return res;
Signature · 1 line
2.55.0

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.

You are receiving this message because of the following common error(s) as indicated below:

- This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what needs to be done here to properly describe this.

If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.

thanks,

greg k-h's patch email bot

author
#4 lore raw

PATCH v2 1/1 staging: rtl8723bs: use kfree_sensitive() for key material in rtw_set_key()

In reply to Ivy Lopez

psetkeyparm holds WEP/TKIP/AES key material copied in via memcpy from psecuritypriv before being freed. Use kfree_sensitive() instead of kfree() so the key bytes are zeroed before the memory is released, consistent with how psetstakey_para is already handled elsewhere in this driver.

Fixes 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

---
v2: add Fixes: tag

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3
index 1196ec011455..fb45f7295386 100644
@@ -1926,14 +1926,14 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		break;
 	default:
 		res = _FAIL;
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 		goto exit;
 	}
 
 	if (enqueue) {
 		pcmd = kzalloc_obj(*pcmd);
 		if (!pcmd) {
-			kfree(psetkeyparm);
+			kfree_sensitive(psetkeyparm);
 			res = _FAIL;  /* try again */
 			goto exit;
 		}
@@ -1949,7 +1949,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 		res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 	} else {
 		setkey_hdl(adapter, (u8 *)psetkeyparm);
-		kfree(psetkeyparm);
+		kfree_sensitive(psetkeyparm);
 	}
 exit:
 	return res;
Signature · 1 line
2.55.0