UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv6: Fix OOPS in ip6_dst_lookup_tail(). 

This fixes kernel bugzilla 11469: "TUN with 1024 neighbours:
ip6_dst_lookup_tail NULL crash"

dst->neighbour is not necessarily hooked up at this point
in the processing path, so blindly dereferencing it is
the wrong thing to do.  This NULL check exists in other
similar paths and this case was just an oversight.

Also fix the completely wrong and confusing indentation
here while we're at it.

Based upon a patch by Evgeniy Polyakov.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Neil Horman 2008-09-09 13:51:35 -07:00 committed by David S. Miller
parent 225f40055f
commit e550dfb0c2
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
net/ipv6/ip6_output.c
View File

@ -943,39 +943,39 @@ static int ip6_dst_lookup_tail(struct sock *sk,
} }
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
/* /*
* Here if the dst entry we've looked up * Here if the dst entry we've looked up
* has a neighbour entry that is in the INCOMPLETE * has a neighbour entry that is in the INCOMPLETE
* state and the src address from the flow is * state and the src address from the flow is
* marked as OPTIMISTIC, we release the found * marked as OPTIMISTIC, we release the found
* dst entry and replace it instead with the * dst entry and replace it instead with the
* dst entry of the nexthop router * dst entry of the nexthop router
*/ */
if (!((*dst)->neighbour->nud_state & NUD_VALID)) { if ((*dst)->neighbour && !((*dst)->neighbour->nud_state & NUD_VALID)) {
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
struct flowi fl_gw; struct flowi fl_gw;
int redirect; int redirect;
ifp = ipv6_get_ifaddr(net, &fl->fl6_src, ifp = ipv6_get_ifaddr(net, &fl->fl6_src,
(*dst)->dev, 1); (*dst)->dev, 1);
redirect = (ifp && ifp->flags & IFA_F_OPTIMISTIC); redirect = (ifp && ifp->flags & IFA_F_OPTIMISTIC);
if (ifp) if (ifp)
in6_ifa_put(ifp); in6_ifa_put(ifp);
if (redirect) { if (redirect) {
/* /*
* We need to get the dst entry for the * We need to get the dst entry for the
* default router instead * default router instead
*/ */
dst_release(*dst); dst_release(*dst);
memcpy(&fl_gw, fl, sizeof(struct flowi)); memcpy(&fl_gw, fl, sizeof(struct flowi));
memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr)); memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr));
*dst = ip6_route_output(net, sk, &fl_gw); *dst = ip6_route_output(net, sk, &fl_gw);
if ((err = (*dst)->error)) if ((err = (*dst)->error))
goto out_err_release; goto out_err_release;
}
} }
}
#endif #endif
return 0; return 0;