[PATCH] wifi: rtw89: fw: Remove "const" on allocation type

[PATCH] wifi: rtw89: fw: Remove "const" on allocation type

[Kees Cook]

In preparation for making the kmalloc family of allocators type aware,
we need to make sure that the returned type from the allocation matches
the type of the variable being assigned. (Before, the allocator would
always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct rtw89_reg2_def *" but the returned type,
while technically matching, will be const qualified. As there isn't a
general way to discard "const" qualifiers, adjust the returned type to
match the assigned type. No change in allocation size results.

Signed-off-by: Kees Cook <kees@kernel.org>
---
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: <linux-wireless@vger.kernel.org>
---
 drivers/net/wireless/realtek/rtw89/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 8643b17866f8..3836813c50e9 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -1018,7 +1018,7 @@ int rtw89_build_phy_tbl_from_elm(struct rtw89_dev *rtwdev,
 	}
 
 	n_regs = le32_to_cpu(elm->size) / sizeof(tbl->regs[0]);
-	regs = kcalloc(n_regs, sizeof(tbl->regs[0]), GFP_KERNEL);
+	regs = kcalloc(n_regs, sizeof(*regs), GFP_KERNEL);
 	if (!regs)
 		goto out;
 
-- 
2.34.1

Re: [PATCH] wifi: rtw89: fw: Remove "const" on allocation type

[Ping-Ke Shih]

Kees Cook <kees@kernel.org> wrote:

> In preparation for making the kmalloc family of allocators type aware,
> we need to make sure that the returned type from the allocation matches
> the type of the variable being assigned. (Before, the allocator would
> always return "void *", which can be implicitly cast to any pointer type.)
> 
> The assigned type is "struct rtw89_reg2_def *" but the returned type,
> while technically matching, will be const qualified. As there isn't a
> general way to discard "const" qualifiers, adjust the returned type to
> match the assigned type. No change in allocation size results.
> 
> Signed-off-by: Kees Cook <kees@kernel.org>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

5b8dfb75b2c7 wifi: rtw89: fw: Remove "const" on allocation type

---
https://github.com/pkshih/rtw.git