Module Name: src
Committed By: rtr
Date: Mon Jul 7 17:13:57 UTC 2014
Modified Files:
src/sys/kern: uipc_usrreq.c
src/sys/net: link_proto.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap_socket.c rfcomm_socket.c sco_socket.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
* sprinkle KASSERT(solocked(so)); in all pr_stat() functions.
* fix remaining inconsistent struct socket parameter names.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.13 -r1.14 src/sys/net/link_proto.c
cvs rdiff -u -r1.152 -r1.153 src/sys/net/rtsock.c
cvs rdiff -u -r1.50 -r1.51 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.20 -r1.21 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.21 -r1.22 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.130 -r1.131 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.205 -r1.206 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.124 -r1.125 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.104 -r1.105 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netnatm/natm.c
cvs rdiff -u -r1.45 -r1.46 src/sys/rump/net/lib/libsockin/sockin.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/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.156 src/sys/kern/uipc_usrreq.c:1.157
--- src/sys/kern/uipc_usrreq.c:1.156 Sun Jul 6 03:33:33 2014
+++ src/sys/kern/uipc_usrreq.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.156 2014/07/06 03:33:33 rtr Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.157 2014/07/07 17:13:56 rtr Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.156 2014/07/06 03:33:33 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.157 2014/07/07 17:13:56 rtr Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -854,6 +854,8 @@ unp_stat(struct socket *so, struct stat
struct unpcb *unp;
struct socket *so2;
+ KASSERT(solocked(so));
+
unp = sotounpcb(so);
if (unp == NULL)
return EINVAL;
Index: src/sys/net/link_proto.c
diff -u src/sys/net/link_proto.c:1.13 src/sys/net/link_proto.c:1.14
--- src/sys/net/link_proto.c:1.13 Sun Jul 6 16:06:19 2014
+++ src/sys/net/link_proto.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: link_proto.c,v 1.13 2014/07/06 16:06:19 rtr Exp $ */
+/* $NetBSD: link_proto.c,v 1.14 2014/07/07 17:13:56 rtr Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.13 2014/07/06 16:06:19 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: link_proto.c,v 1.14 2014/07/07 17:13:56 rtr Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -242,6 +242,8 @@ link_ioctl(struct socket *so, u_long cmd
static int
link_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return EOPNOTSUPP;
}
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.152 src/sys/net/rtsock.c:1.153
--- src/sys/net/rtsock.c:1.152 Mon Jul 7 15:13:21 2014
+++ src/sys/net/rtsock.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.152 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: rtsock.c,v 1.153 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.152 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.153 2014/07/07 17:13:56 rtr Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -233,6 +233,8 @@ COMPATNAME(route_ioctl)(struct socket *s
static int
COMPATNAME(route_stat)(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/netatalk/ddp_usrreq.c
diff -u src/sys/netatalk/ddp_usrreq.c:1.50 src/sys/netatalk/ddp_usrreq.c:1.51
--- src/sys/netatalk/ddp_usrreq.c:1.50 Mon Jul 7 15:13:21 2014
+++ src/sys/netatalk/ddp_usrreq.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.50 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.51 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.50 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.51 2014/07/07 17:13:56 rtr Exp $");
#include "opt_mbuftrace.h"
@@ -481,6 +481,8 @@ ddp_ioctl(struct socket *so, u_long cmd,
static int
ddp_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
/* stat: don't bother with a blocksize. */
return 0;
}
Index: src/sys/netbt/hci_socket.c
diff -u src/sys/netbt/hci_socket.c:1.29 src/sys/netbt/hci_socket.c:1.30
--- src/sys/netbt/hci_socket.c:1.29 Mon Jul 7 15:13:21 2014
+++ src/sys/netbt/hci_socket.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hci_socket.c,v 1.29 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: hci_socket.c,v 1.30 2014/07/07 17:13:56 rtr Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hci_socket.c,v 1.29 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hci_socket.c,v 1.30 2014/07/07 17:13:56 rtr Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -484,7 +484,7 @@ hci_detach(struct socket *so)
}
static int
-hci_ioctl(struct socket *up, u_long cmd, void *nam, struct ifnet *ifp)
+hci_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp)
{
int err;
mutex_enter(bt_lock);
@@ -496,6 +496,8 @@ hci_ioctl(struct socket *up, u_long cmd,
static int
hci_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/netbt/l2cap_socket.c
diff -u src/sys/netbt/l2cap_socket.c:1.20 src/sys/netbt/l2cap_socket.c:1.21
--- src/sys/netbt/l2cap_socket.c:1.20 Mon Jul 7 15:13:21 2014
+++ src/sys/netbt/l2cap_socket.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: l2cap_socket.c,v 1.20 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: l2cap_socket.c,v 1.21 2014/07/07 17:13:56 rtr Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.20 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.21 2014/07/07 17:13:56 rtr Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -117,7 +117,7 @@ l2cap_detach(struct socket *so)
}
static int
-l2cap_ioctl(struct socket *up, u_long cmd, void *nam, struct ifnet *ifp)
+l2cap_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp)
{
return EPASSTHROUGH;
}
@@ -125,6 +125,8 @@ l2cap_ioctl(struct socket *up, u_long cm
static int
l2cap_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/netbt/rfcomm_socket.c
diff -u src/sys/netbt/rfcomm_socket.c:1.21 src/sys/netbt/rfcomm_socket.c:1.22
--- src/sys/netbt/rfcomm_socket.c:1.21 Mon Jul 7 15:13:21 2014
+++ src/sys/netbt/rfcomm_socket.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_socket.c,v 1.21 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: rfcomm_socket.c,v 1.22 2014/07/07 17:13:56 rtr Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.21 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.22 2014/07/07 17:13:56 rtr Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -125,7 +125,7 @@ rfcomm_detach(struct socket *so)
}
static int
-rfcomm_ioctl(struct socket *up, u_long cmd, void *nam, struct ifnet *ifp)
+rfcomm_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp)
{
return EPASSTHROUGH;
}
@@ -133,6 +133,8 @@ rfcomm_ioctl(struct socket *up, u_long c
static int
rfcomm_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/netbt/sco_socket.c
diff -u src/sys/netbt/sco_socket.c:1.22 src/sys/netbt/sco_socket.c:1.23
--- src/sys/netbt/sco_socket.c:1.22 Mon Jul 7 15:13:21 2014
+++ src/sys/netbt/sco_socket.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sco_socket.c,v 1.22 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: sco_socket.c,v 1.23 2014/07/07 17:13:56 rtr Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.22 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.23 2014/07/07 17:13:56 rtr Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -108,7 +108,7 @@ sco_detach(struct socket *so)
}
static int
-sco_ioctl(struct socket *up, u_long cmd, void *nam, struct ifnet *ifp)
+sco_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp)
{
return EOPNOTSUPP;
}
@@ -116,6 +116,8 @@ sco_ioctl(struct socket *up, u_long cmd,
static int
sco_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.130 src/sys/netinet/raw_ip.c:1.131
--- src/sys/netinet/raw_ip.c:1.130 Mon Jul 7 15:13:21 2014
+++ src/sys/netinet/raw_ip.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.130 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.131 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.130 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.131 2014/07/07 17:13:56 rtr Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -575,6 +575,8 @@ rip_ioctl(struct socket *so, u_long cmd,
static int
rip_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
/* stat: don't bother with a blocksize. */
return 0;
}
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.183 src/sys/netinet/tcp_usrreq.c:1.184
--- src/sys/netinet/tcp_usrreq.c:1.183 Mon Jul 7 15:13:21 2014
+++ src/sys/netinet/tcp_usrreq.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.183 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.184 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.183 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.184 2014/07/07 17:13:56 rtr Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -956,6 +956,8 @@ tcp_ioctl(struct socket *so, u_long cmd,
static int
tcp_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
/* stat: don't bother with a blocksize. */
return 0;
}
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.205 src/sys/netinet/udp_usrreq.c:1.206
--- src/sys/netinet/udp_usrreq.c:1.205 Mon Jul 7 15:13:21 2014
+++ src/sys/netinet/udp_usrreq.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.205 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.206 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.205 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.206 2014/07/07 17:13:56 rtr Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -903,6 +903,8 @@ udp_ioctl(struct socket *so, u_long cmd,
static int
udp_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
/* stat: don't bother with a blocksize. */
return 0;
}
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.124 src/sys/netinet6/raw_ip6.c:1.125
--- src/sys/netinet6/raw_ip6.c:1.124 Mon Jul 7 15:13:21 2014
+++ src/sys/netinet6/raw_ip6.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.124 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.125 2014/07/07 17:13:56 rtr Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.124 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.125 2014/07/07 17:13:56 rtr Exp $");
#include "opt_ipsec.h"
@@ -653,6 +653,8 @@ rip6_ioctl(struct socket *so, u_long cmd
static int
rip6_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
/* stat: don't bother with a blocksize */
return 0;
}
Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.104 src/sys/netinet6/udp6_usrreq.c:1.105
--- src/sys/netinet6/udp6_usrreq.c:1.104 Mon Jul 7 15:13:21 2014
+++ src/sys/netinet6/udp6_usrreq.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_usrreq.c,v 1.104 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: udp6_usrreq.c,v 1.105 2014/07/07 17:13:56 rtr Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.104 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.105 2014/07/07 17:13:56 rtr Exp $");
#include "opt_inet.h"
#include "opt_inet_csum.h"
@@ -696,6 +696,8 @@ udp6_ioctl(struct socket *so, u_long cmd
static int
udp6_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
/* stat: don't bother with a blocksize */
return 0;
}
Index: src/sys/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.32 src/sys/netipsec/keysock.c:1.33
--- src/sys/netipsec/keysock.c:1.32 Mon Jul 7 15:13:21 2014
+++ src/sys/netipsec/keysock.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.32 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: keysock.c,v 1.33 2014/07/07 17:13:56 rtr Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.32 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.33 2014/07/07 17:13:56 rtr Exp $");
#include "opt_ipsec.h"
@@ -493,6 +493,8 @@ key_ioctl(struct socket *so, u_long cmd,
static int
key_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/netmpls/mpls_proto.c
diff -u src/sys/netmpls/mpls_proto.c:1.12 src/sys/netmpls/mpls_proto.c:1.13
--- src/sys/netmpls/mpls_proto.c:1.12 Sun Jul 6 04:47:26 2014
+++ src/sys/netmpls/mpls_proto.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_proto.c,v 1.12 2014/07/06 04:47:26 rtr Exp $ */
+/* $NetBSD: mpls_proto.c,v 1.13 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpls_proto.c,v 1.12 2014/07/06 04:47:26 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpls_proto.c,v 1.13 2014/07/07 17:13:56 rtr Exp $");
#include "opt_inet.h"
#include "opt_mbuftrace.h"
@@ -103,6 +103,8 @@ mpls_ioctl(struct socket *so, u_long cmd
static int
mpls_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return EOPNOTSUPP;
}
Index: src/sys/netnatm/natm.c
diff -u src/sys/netnatm/natm.c:1.34 src/sys/netnatm/natm.c:1.35
--- src/sys/netnatm/natm.c:1.34 Mon Jul 7 15:13:21 2014
+++ src/sys/netnatm/natm.c Mon Jul 7 17:13:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.c,v 1.34 2014/07/07 15:13:21 rtr Exp $ */
+/* $NetBSD: natm.c,v 1.35 2014/07/07 17:13:56 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.34 2014/07/07 15:13:21 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm.c,v 1.35 2014/07/07 17:13:56 rtr Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -140,6 +140,8 @@ done:
static int
natm_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
Index: src/sys/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.45 src/sys/rump/net/lib/libsockin/sockin.c:1.46
--- src/sys/rump/net/lib/libsockin/sockin.c:1.45 Mon Jul 7 15:13:22 2014
+++ src/sys/rump/net/lib/libsockin/sockin.c Mon Jul 7 17:13:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.45 2014/07/07 15:13:22 rtr Exp $ */
+/* $NetBSD: sockin.c,v 1.46 2014/07/07 17:13:57 rtr Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.45 2014/07/07 15:13:22 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.46 2014/07/07 17:13:57 rtr Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -462,6 +462,8 @@ sockin_ioctl(struct socket *so, u_long c
static int
sockin_stat(struct socket *so, struct stat *ub)
{
+ KASSERT(solocked(so));
+
return 0;
}
