Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/compat Pull up following revision(s) (requested by oz...
details: https://anonhg.NetBSD.org/src/rev/bc552141c9e3
branches: netbsd-8
changeset: 851722:bc552141c9e3
user: martin <martin%NetBSD.org@localhost>
date: Sat May 12 10:29:08 2018 +0000
description:
Pull up following revision(s) (requested by ozaki-r in ticket #818):
sys/compat/linux/common/linux_socket.c: revision 1.142
sys/compat/linux32/common/linux32_socket.c: revision 1.29
Fix pserialize enter/exit pairs in linux_getifconf and linux32_getifconf
Tested by using a small linux program that uses ioctl(SIOCGIFCONF).
Probably fix PR kern/53259 as well.
diffstat:
sys/compat/linux/common/linux_socket.c | 6 +++---
sys/compat/linux32/common/linux32_socket.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (54 lines):
diff -r 780760be44e3 -r bc552141c9e3 sys/compat/linux/common/linux_socket.c
--- a/sys/compat/linux/common/linux_socket.c Wed May 09 15:38:05 2018 +0000
+++ b/sys/compat/linux/common/linux_socket.c Sat May 12 10:29:08 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.138.6.1 2017/11/30 15:57:37 martin Exp $ */
+/* $NetBSD: linux_socket.c,v 1.138.6.2 2018/05/12 10:29:08 martin Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.138.6.1 2017/11/30 15:57:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.138.6.2 2018/05/12 10:29:08 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1180,7 +1180,7 @@
ifa_release(ifa, &psref_ifa);
}
- s = pserialize_read_enter();
+ KASSERT(pserialize_in_read_section());
if_release(ifp, &psref);
}
pserialize_read_exit(s);
diff -r 780760be44e3 -r bc552141c9e3 sys/compat/linux32/common/linux32_socket.c
--- a/sys/compat/linux32/common/linux32_socket.c Wed May 09 15:38:05 2018 +0000
+++ b/sys/compat/linux32/common/linux32_socket.c Sat May 12 10:29:08 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_socket.c,v 1.27.6.1 2017/11/30 15:57:36 martin Exp $ */
+/* $NetBSD: linux32_socket.c,v 1.27.6.2 2018/05/12 10:29:08 martin Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.27.6.1 2017/11/30 15:57:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.27.6.2 2018/05/12 10:29:08 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -478,7 +478,7 @@
ifa_release(ifa, &psref_ifa);
}
- s = pserialize_read_enter();
+ KASSERT(pserialize_in_read_section());
if_release(ifp, &psref);
}
pserialize_read_exit(s);
Home |
Main Index |
Thread Index |
Old Index