* [PATCH][next] nfp: flower: Use struct_size() helper in kmalloc()
@ 2022-01-25 19:33 Gustavo A. R. Silva
2022-01-26 8:24 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2022-01-25 19:33 UTC (permalink / raw)
To: Simon Horman, Jakub Kicinski, David S. Miller
Cc: oss-drivers, netdev, 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/net/ethernet/netronome/nfp/flower/tunnel_conf.c:359:25: 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/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
index dfb4468fe287..ce865e619568 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
@@ -356,7 +356,7 @@ __nfp_tun_add_route_to_cache(struct list_head *route_list,
return 0;
}
- entry = kmalloc(sizeof(*entry) + add_len, GFP_ATOMIC);
+ entry = kmalloc(struct_size(entry, ip_add, add_len), GFP_ATOMIC);
if (!entry) {
spin_unlock_bh(list_lock);
return -ENOMEM;
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] nfp: flower: Use struct_size() helper in kmalloc()
2022-01-25 19:33 [PATCH][next] nfp: flower: Use struct_size() helper in kmalloc() Gustavo A. R. Silva
@ 2022-01-26 8:24 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2022-01-26 8:24 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Jakub Kicinski, David S. Miller, oss-drivers, netdev,
linux-kernel, linux-hardening
On Tue, Jan 25, 2022 at 01:33:19PM -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/net/ethernet/netronome/nfp/flower/tunnel_conf.c:359:25: 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>
Acked-by: Simon Horman <simon.horman@corigine.com>
> ---
> drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
> index dfb4468fe287..ce865e619568 100644
> --- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
> +++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
> @@ -356,7 +356,7 @@ __nfp_tun_add_route_to_cache(struct list_head *route_list,
> return 0;
> }
>
> - entry = kmalloc(sizeof(*entry) + add_len, GFP_ATOMIC);
> + entry = kmalloc(struct_size(entry, ip_add, add_len), GFP_ATOMIC);
> if (!entry) {
> spin_unlock_bh(list_lock);
> return -ENOMEM;
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-26 8:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-25 19:33 [PATCH][next] nfp: flower: Use struct_size() helper in kmalloc() Gustavo A. R. Silva
2022-01-26 8:24 ` Simon Horman
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).