| Message ID | 20230818182249.3348910-1-prohr@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5cb249686e67dbef3ffe53887fa725eefc5a7144 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: release reference to inet6_dev pointer | expand |
On Fri, Aug 18, 2023 at 11:22:49AM -0700, Patrick Rohr wrote: > addrconf_prefix_rcv returned early without releasing the inet6_dev > pointer when the PIO lifetime is less than accept_ra_min_lft. > > Fixes: 5027d54a9c30 ("net: change accept_ra_min_rtr_lft to affect all RA lifetimes") > Cc: Maciej Żenczykowski <maze@google.com> > Cc: Lorenzo Colitti <lorenzo@google.com> > Cc: David Ahern <dsahern@kernel.org> > Cc: Simon Horman <horms@kernel.org> > Reviewed-by: Simon Horman <horms@kernel.org> > Reviewed-by: Maciej Żenczykowski <maze@google.com> > Signed-off-by: Patrick Rohr <prohr@google.com> > --- > net/ipv6/addrconf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 18 Aug 2023 11:22:49 -0700 you wrote: > addrconf_prefix_rcv returned early without releasing the inet6_dev > pointer when the PIO lifetime is less than accept_ra_min_lft. > > Fixes: 5027d54a9c30 ("net: change accept_ra_min_rtr_lft to affect all RA lifetimes") > Cc: Maciej Żenczykowski <maze@google.com> > Cc: Lorenzo Colitti <lorenzo@google.com> > Cc: David Ahern <dsahern@kernel.org> > Cc: Simon Horman <horms@kernel.org> > Reviewed-by: Simon Horman <horms@kernel.org> > Reviewed-by: Maciej Żenczykowski <maze@google.com> > Signed-off-by: Patrick Rohr <prohr@google.com> > > [...] Here is the summary with links: - [net-next,v2] net: release reference to inet6_dev pointer https://git.kernel.org/netdev/net-next/c/5cb249686e67 You are awesome, thank you!
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5184bd0ceb12..47d1dd8501b7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2742,7 +2742,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) } if (valid_lft != 0 && valid_lft < in6_dev->cnf.accept_ra_min_lft) - return; + goto put; /* * Two things going on here:
addrconf_prefix_rcv returned early without releasing the inet6_dev pointer when the PIO lifetime is less than accept_ra_min_lft. Fixes: 5027d54a9c30 ("net: change accept_ra_min_rtr_lft to affect all RA lifetimes") Cc: Maciej Żenczykowski <maze@google.com> Cc: Lorenzo Colitti <lorenzo@google.com> Cc: David Ahern <dsahern@kernel.org> Cc: Simon Horman <horms@kernel.org> Reviewed-by: Simon Horman <horms@kernel.org> Reviewed-by: Maciej Żenczykowski <maze@google.com> Signed-off-by: Patrick Rohr <prohr@google.com> --- net/ipv6/addrconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)