Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Add missing IFNET_LOCK for regen_tmpaddr



details:   https://anonhg.NetBSD.org/src/rev/54a0ce673123
branches:  trunk
changeset: 964725:54a0ce673123
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Aug 14 08:34:44 2019 +0000

description:
Add missing IFNET_LOCK for regen_tmpaddr

Reported by ryo@

diffstat:

 sys/netinet6/nd6.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r b95f46104257 -r 54a0ce673123 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Wed Aug 14 03:44:58 2019 +0000
+++ b/sys/netinet6/nd6.c        Wed Aug 14 08:34:44 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6.c,v 1.256 2019/07/26 10:18:42 christos Exp $       */
+/*     $NetBSD: nd6.c,v 1.257 2019/08/14 08:34:44 ozaki-r Exp $        */
 /*     $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $   */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.256 2019/07/26 10:18:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.257 2019/08/14 08:34:44 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -666,8 +666,12 @@
                        if (ip6_use_tempaddr &&
                            (ia6->ia6_flags & IN6_IFF_TEMPORARY) != 0 &&
                            (oldflags & IN6_IFF_DEPRECATED) == 0) {
+                               int ret;
 
-                               if (regen_tmpaddr(ia6) == 0) {
+                               IFNET_LOCK(ia6->ia_ifa.ifa_ifp);
+                               ret = regen_tmpaddr(ia6);
+                               IFNET_UNLOCK(ia6->ia_ifa.ifa_ifp);
+                               if (ret == 0) {
                                        /*
                                         * A new temporary address is
                                         * generated.



Home | Main Index | Thread Index | Old Index