| Message ID | 20221018090628.never.537-kees@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ab3f7828c9793a5dfa99a54dc19ae3491c38bfa3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | openvswitch: Use kmalloc_size_roundup() to match ksize() usage | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 18 Oct 2022 02:06:33 -0700 you wrote: > Round up allocations with kmalloc_size_roundup() so that openvswitch's > use of ksize() is always accurate and no special handling of the memory > is needed by KASAN, UBSAN_BOUNDS, nor FORTIFY_SOURCE. > > Cc: Pravin B Shelar <pshelar@ovn.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Paolo Abeni <pabeni@redhat.com> > Cc: netdev@vger.kernel.org > Cc: dev@openvswitch.org > Signed-off-by: Kees Cook <keescook@chromium.org> > > [...] Here is the summary with links: - openvswitch: Use kmalloc_size_roundup() to match ksize() usage https://git.kernel.org/netdev/net-next/c/ab3f7828c979 You are awesome, thank you!
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 4a07ab094a84..ead5418c126e 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -2309,7 +2309,7 @@ static struct sw_flow_actions *nla_alloc_flow_actions(int size) WARN_ON_ONCE(size > MAX_ACTIONS_BUFSIZE); - sfa = kmalloc(sizeof(*sfa) + size, GFP_KERNEL); + sfa = kmalloc(kmalloc_size_roundup(sizeof(*sfa) + size), GFP_KERNEL); if (!sfa) return ERR_PTR(-ENOMEM);
Round up allocations with kmalloc_size_roundup() so that openvswitch's use of ksize() is always accurate and no special handling of the memory is needed by KASAN, UBSAN_BOUNDS, nor FORTIFY_SOURCE. Cc: Pravin B Shelar <pshelar@ovn.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: netdev@vger.kernel.org Cc: dev@openvswitch.org Signed-off-by: Kees Cook <keescook@chromium.org> --- net/openvswitch/flow_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)