Message ID | 20230719100228.373055-2-steffen.klassert@secunet.com (mailing list archive) |
---|---|
State | Accepted |
Commit | a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | xfrm: delete not-needed clear to zero of encap_oa | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Steffen Klassert <steffen.klassert@secunet.com>: On Wed, 19 Jul 2023 12:02:28 +0200 you wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > After commit 2f4796518315 ("af_key: Fix heap information leak"), there is > no need to clear encap_oa again as it is already initialized to zero. > > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > Reviewed-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> > > [...] Here is the summary with links: - xfrm: delete not-needed clear to zero of encap_oa https://git.kernel.org/netdev/net-next/c/a94fd40a18ae You are awesome, thank you!
diff --git a/net/key/af_key.c b/net/key/af_key.c index a815f5ab4c49..1cb4560afd44 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1281,7 +1281,6 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, ext_hdrs[SADB_X_EXT_NAT_T_DPORT-1]; natt->encap_dport = n_port->sadb_x_nat_t_port_port; } - memset(&natt->encap_oa, 0, sizeof(natt->encap_oa)); } err = xfrm_init_state(x);