* [PATCH][next] NTB/msi: Use struct_size() helper in devm_kzalloc()
@ 2022-01-20 23:02 Gustavo A. R. Silva
2022-01-20 23:34 ` Kees Cook
2022-01-21 16:24 ` Logan Gunthorpe
0 siblings, 2 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2022-01-20 23:02 UTC (permalink / raw)
To: Jon Mason, Dave Jiang, Allen Hubbe
Cc: linux-ntb, linux-kernel, Gustavo A. R. Silva, linux-hardening
Make use of the struct_size() helper instead of an open-coded version,
in order to avoid any potential type mistakes or integer overflows that,
in the worst scenario, could lead to heap overflows.
Also, address the following sparse warnings:
drivers/ntb/msi.c:46:23: warning: using sizeof on a flexible structure
Link: https://github.com/KSPP/linux/issues/174
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/ntb/msi.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/ntb/msi.c b/drivers/ntb/msi.c
index dd683cb58d09..6295e55ef85e 100644
--- a/drivers/ntb/msi.c
+++ b/drivers/ntb/msi.c
@@ -33,7 +33,6 @@ int ntb_msi_init(struct ntb_dev *ntb,
{
phys_addr_t mw_phys_addr;
resource_size_t mw_size;
- size_t struct_size;
int peer_widx;
int peers;
int ret;
@@ -43,9 +42,8 @@ int ntb_msi_init(struct ntb_dev *ntb,
if (peers <= 0)
return -EINVAL;
- struct_size = sizeof(*ntb->msi) + sizeof(*ntb->msi->peer_mws) * peers;
-
- ntb->msi = devm_kzalloc(&ntb->dev, struct_size, GFP_KERNEL);
+ ntb->msi = devm_kzalloc(&ntb->dev, struct_size(ntb->msi, peer_mws, peers),
+ GFP_KERNEL);
if (!ntb->msi)
return -ENOMEM;
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] NTB/msi: Use struct_size() helper in devm_kzalloc()
2022-01-20 23:02 [PATCH][next] NTB/msi: Use struct_size() helper in devm_kzalloc() Gustavo A. R. Silva
@ 2022-01-20 23:34 ` Kees Cook
2022-01-21 16:24 ` Logan Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2022-01-20 23:34 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Jon Mason, Dave Jiang, Allen Hubbe, linux-ntb, linux-kernel,
linux-hardening
On Thu, Jan 20, 2022 at 05:02:47PM -0600, Gustavo A. R. Silva wrote:
> Make use of the struct_size() helper instead of an open-coded version,
> in order to avoid any potential type mistakes or integer overflows that,
> in the worst scenario, could lead to heap overflows.
>
> Also, address the following sparse warnings:
> drivers/ntb/msi.c:46:23: warning: using sizeof on a flexible structure
>
> Link: https://github.com/KSPP/linux/issues/174
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Heh, the variable was even named struct_size. ;)
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] NTB/msi: Use struct_size() helper in devm_kzalloc()
2022-01-20 23:02 [PATCH][next] NTB/msi: Use struct_size() helper in devm_kzalloc() Gustavo A. R. Silva
2022-01-20 23:34 ` Kees Cook
@ 2022-01-21 16:24 ` Logan Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Logan Gunthorpe @ 2022-01-21 16:24 UTC (permalink / raw)
To: Gustavo A. R. Silva, Jon Mason, Dave Jiang, Allen Hubbe
Cc: linux-ntb, linux-kernel, linux-hardening
On 2022-01-20 4:02 p.m., Gustavo A. R. Silva wrote:
> Make use of the struct_size() helper instead of an open-coded version,
> in order to avoid any potential type mistakes or integer overflows that,
> in the worst scenario, could lead to heap overflows.
>
> Also, address the following sparse warnings:
> drivers/ntb/msi.c:46:23: warning: using sizeof on a flexible structure
>
> Link: https://github.com/KSPP/linux/issues/174
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks, looks good to me.
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-21 16:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-20 23:02 [PATCH][next] NTB/msi: Use struct_size() helper in devm_kzalloc() Gustavo A. R. Silva
2022-01-20 23:34 ` Kees Cook
2022-01-21 16:24 ` Logan Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).