Module Name: src
Committed By: snj
Date: Mon Mar 29 00:29:44 UTC 2010
Modified Files:
src/sys/netinet [netbsd-5]: in.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1357):
sys/netinet/in.c: revision 1.137 via patch
Fixed a number of race conditions in the case of receiving ipv4 packet.
found by iij seil team.
To generate a diff of this commit:
cvs rdiff -u -r1.127.4.1 -r1.127.4.2 src/sys/netinet/in.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.127.4.1 src/sys/netinet/in.c:1.127.4.2
--- src/sys/netinet/in.c:1.127.4.1 Fri Jan 9 02:57:34 2009
+++ src/sys/netinet/in.c Mon Mar 29 00:29:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.127.4.1 2009/01/09 02:57:34 snj Exp $ */
+/* $NetBSD: in.c,v 1.127.4.2 2010/03/29 00:29:44 snj Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.127.4.1 2009/01/09 02:57:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.127.4.2 2010/03/29 00:29:44 snj Exp $");
#include "opt_inet.h"
#include "opt_inet_conf.h"
@@ -398,6 +398,7 @@
if (ia == 0)
return (ENOBUFS);
bzero((void *)ia, sizeof *ia);
+ mutex_enter(softnet_lock);
TAILQ_INSERT_TAIL(&in_ifaddrhead, ia, ia_list);
IFAREF(&ia->ia_ifa);
ifa_insert(ifp, &ia->ia_ifa);
@@ -417,6 +418,7 @@
ia->ia_ifp = ifp;
ia->ia_idsalt = arc4random() % 65535;
LIST_INIT(&ia->ia_multiaddrs);
+ mutex_exit(softnet_lock);
newifaddr = 1;
}
break;
@@ -464,12 +466,14 @@
case SIOCSIFDSTADDR:
if ((ifp->if_flags & IFF_POINTOPOINT) == 0)
return (EINVAL);
+ mutex_enter(softnet_lock);
oldaddr = ia->ia_dstaddr;
ia->ia_dstaddr = *satocsin(ifreq_getdstaddr(cmd, ifr));
if (ifp->if_ioctl != NULL &&
(error = (*ifp->if_ioctl)(ifp, SIOCSIFDSTADDR,
(void *)ia)) != 0) {
ia->ia_dstaddr = oldaddr;
+ mutex_exit(softnet_lock);
return error;
}
if (ia->ia_flags & IFA_ROUTE) {
@@ -478,6 +482,7 @@
ia->ia_ifa.ifa_dstaddr = sintosa(&ia->ia_dstaddr);
rtinit(&ia->ia_ifa, RTM_ADD, RTF_HOST|RTF_UP);
}
+ mutex_exit(softnet_lock);
break;
case SIOCSIFBRDADDR:
@@ -487,6 +492,7 @@
break;
case SIOCSIFADDR:
+ mutex_enter(softnet_lock);
error = in_ifinit(ifp, ia, satocsin(ifreq_getaddr(cmd, ifr)),
1);
#ifdef PFIL_HOOKS
@@ -494,18 +500,22 @@
(void)pfil_run_hooks(&if_pfil,
(struct mbuf **)SIOCSIFADDR, ifp, PFIL_IFADDR);
#endif
+ mutex_exit(softnet_lock);
break;
case SIOCSIFNETMASK:
+ mutex_enter(softnet_lock);
in_ifscrub(ifp, ia);
ia->ia_sockmask = *satocsin(ifreq_getaddr(cmd, ifr));
ia->ia_subnetmask = ia->ia_sockmask.sin_addr.s_addr;
error = in_ifinit(ifp, ia, NULL, 0);
+ mutex_exit(softnet_lock);
break;
case SIOCAIFADDR:
maskIsNew = 0;
hostIsNew = 1;
+ mutex_enter(softnet_lock);
if (ia->ia_addr.sin_family != AF_INET)
;
else if (ifra->ifra_addr.sin_len == 0) {
@@ -538,6 +548,7 @@
(void)pfil_run_hooks(&if_pfil,
(struct mbuf **)SIOCAIFADDR, ifp, PFIL_IFADDR);
#endif
+ mutex_exit(softnet_lock);
break;
case SIOCGIFALIAS:
@@ -554,11 +565,13 @@
break;
case SIOCDIFADDR:
+ mutex_enter(softnet_lock);
in_purgeaddr(&ia->ia_ifa);
#ifdef PFIL_HOOKS
(void)pfil_run_hooks(&if_pfil, (struct mbuf **)SIOCDIFADDR,
ifp, PFIL_IFADDR);
#endif
+ mutex_exit(softnet_lock);
break;
#ifdef MROUTING
