linux-kernel - [PATCH -next v2] wifi: brcmsmac: Use kvmemdup to simplify the code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240821070257.2298559-1-ruanjinjie@huawei.com>
Date: Wed, 21 Aug 2024 15:02:57 +0800
From: Jinjie Ruan <ruanjinjie@...wei.com>
To: <arend.vanspriel@...adcom.com>, <kvalo@...nel.org>,
	<johannes.berg@...el.com>, <miriam.rachel.korenblit@...el.com>,
	<erick.archer@...look.com>, <ruanjinjie@...wei.com>,
	<emmanuel.grumbach@...el.com>, <linux-wireless@...r.kernel.org>,
	<brcm80211@...ts.linux.dev>, <brcm80211-dev-list.pdl@...adcom.com>,
	<linux-kernel@...r.kernel.org>
Subject: [PATCH -next v2] wifi: brcmsmac: Use kvmemdup to simplify the code

Use kvmemdup instead of kvmalloc() + memcpy() to simplify the code.

No functional change.

Signed-off-by: Jinjie Ruan <ruanjinjie@...wei.com>
---
v2:
- Update the commit subject.
- Remove goto lablel and retun -ENOMEM instead.
---
 .../net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
index d86f28b8bc60..5b1d35601bbd 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
@@ -1611,10 +1611,9 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
 			if (le32_to_cpu(hdr->idx) == idx) {
 				pdata = wl->fw.fw_bin[i]->data +
 					le32_to_cpu(hdr->offset);
-				*pbuf = kvmalloc(len, GFP_KERNEL);
+				*pbuf = kvmemdup(pdata, len, GFP_KERNEL);
 				if (*pbuf == NULL)
-					goto fail;
-				memcpy(*pbuf, pdata, len);
+					return -ENOMEM;
 				return 0;
 			}
 		}
@@ -1622,7 +1621,6 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
 	brcms_err(wl->wlc->hw->d11core,
 		  "ERROR: ucode buf tag:%d can not be found!\n", idx);
 	*pbuf = NULL;
-fail:
 	return -ENODATA;
 }
 
-- 
2.34.1