Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid panic when a packet with nonexistent link-local address is issued.

Browse Source 
kame 1.151 -> 1.152.
This commit is contained in:
itojun 2001-02-02 15:54:56 +00:00
parent bcbf09100a
commit d17dfd2fc0
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/netinet6/ip6_output.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: ip6_output.c,v 1.28 2001/01/24 09:04:17 itojun Exp $ */ /* $NetBSD: ip6_output.c,v 1.29 2001/02/02 15:54:56 itojun Exp $ */
/* $KAME: ip6_output.c,v 1.122 2000/08/19 02:12:02 jinmei Exp $ */ /* $KAME: ip6_output.c,v 1.152 2001/02/02 15:36:33 jinmei Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -768,11 +768,24 @@ skip_ipsec2:;
* Larger scopes than link will be supported in the near * Larger scopes than link will be supported in the near
* future. * future.
*/ */
origifp = NULL;
if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src))
origifp = ifindex2ifnet[ntohs(ip6->ip6_src.s6_addr16[1])]; origifp = ifindex2ifnet[ntohs(ip6->ip6_src.s6_addr16[1])];
else if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) else if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst))
origifp = ifindex2ifnet[ntohs(ip6->ip6_dst.s6_addr16[1])]; origifp = ifindex2ifnet[ntohs(ip6->ip6_dst.s6_addr16[1])];
else /*
* XXX: origifp can be NULL even in those two cases above.
* For example, if we remove the (only) link-local address
* from the loopback interface, and try to send a link-local
* address without link-id information. Then the source
* address is ::1, and the destination address is the
* link-local address with its s6_addr16[1] being zero.
* What is worse, if the packet goes to the loopback interface
* by a default rejected route, the null pointer would be
* passed to looutput, and the kernel would hang.
* The following last resort would prevent such disaster.
*/
if (origifp == NULL);
origifp = ifp; origifp = ifp;
} }
else else