Module Name: src
Committed By: roy
Date: Wed Mar 21 14:23:55 UTC 2018
Modified Files:
src/sys/netatalk: ddp_input.c
src/sys/netcan: can.c
src/sys/netinet: ip_mroute.c raw_ip.c
src/sys/netinet6: icmp6.c ip6_input.c ip6_mroute.c raw_ip6.c
Log Message:
Sprinkle more soroverflow().
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netcan/can.c
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.171 -r1.172 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.194 -r1.195 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.122 -r1.123 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.165 -r1.166 src/sys/netinet6/raw_ip6.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/netatalk/ddp_input.c
diff -u src/sys/netatalk/ddp_input.c:1.30 src/sys/netatalk/ddp_input.c:1.31
--- src/sys/netatalk/ddp_input.c:1.30 Sat Feb 17 19:10:18 2018
+++ src/sys/netatalk/ddp_input.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_input.c,v 1.30 2018/02/17 19:10:18 rjs Exp $ */
+/* $NetBSD: ddp_input.c,v 1.31 2018/03/21 14:23:54 roy Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.30 2018/02/17 19:10:18 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.31 2018/03/21 14:23:54 roy Exp $");
#include "opt_atalk.h"
#include <sys/param.h>
@@ -316,6 +316,7 @@ ddp_input(struct mbuf *m, struct ifnet *
if (sbappendaddr(&ddp->ddp_socket->so_rcv, (struct sockaddr *) & from,
m, (struct mbuf *) 0) == 0) {
DDP_STATINC(DDP_STAT_NOSOCKSPACE);
+ soroverflow(ddp->ddp_socket);
m_freem(m);
return;
}
Index: src/sys/netcan/can.c
diff -u src/sys/netcan/can.c:1.2 src/sys/netcan/can.c:1.3
--- src/sys/netcan/can.c:1.2 Sat May 27 21:02:56 2017
+++ src/sys/netcan/can.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: can.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $ */
+/* $NetBSD: can.c,v 1.3 2018/03/21 14:23:54 roy Exp $ */
/*-
* Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.3 2018/03/21 14:23:54 roy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -397,6 +397,7 @@ canintr(void)
if (sbappendaddr(&canp->canp_socket->so_rcv,
(struct sockaddr *) &from, mc,
(struct mbuf *) 0) == 0) {
+ soroverflow(canp->canp_socket);
m_freem(mc);
} else
sorwakeup(canp->canp_socket);
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.154 src/sys/netinet/ip_mroute.c:1.155
--- src/sys/netinet/ip_mroute.c:1.154 Fri Feb 9 08:03:33 2018
+++ src/sys/netinet/ip_mroute.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.154 2018/02/09 08:03:33 maxv Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.155 2018/03/21 14:23:54 roy Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.154 2018/02/09 08:03:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.155 2018/03/21 14:23:54 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1244,6 +1244,7 @@ socket_send(struct socket *s, struct mbu
sorwakeup(s);
return 0;
}
+ soroverflow(s);
}
m_freem(mm);
return -1;
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.171 src/sys/netinet/raw_ip.c:1.172
--- src/sys/netinet/raw_ip.c:1.171 Wed Feb 28 11:23:24 2018
+++ src/sys/netinet/raw_ip.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.171 2018/02/28 11:23:24 maxv Exp $ */
+/* $NetBSD: raw_ip.c,v 1.172 2018/03/21 14:23:54 roy 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.171 2018/02/28 11:23:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.172 2018/03/21 14:23:54 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -146,7 +146,7 @@ rip_sbappendaddr(struct inpcb *last, str
|| SOOPT_TIMESTAMP(last->inp_socket->so_options))
ip_savecontrol(last, &opts, ip, n);
if (sbappendaddr(&last->inp_socket->so_rcv, sa, n, opts) == 0) {
- /* should notify about lost packet */
+ soroverflow(last->inp_socket);
m_freem(n);
if (opts)
m_freem(opts);
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.223 src/sys/netinet6/icmp6.c:1.224
--- src/sys/netinet6/icmp6.c:1.223 Wed Feb 28 11:23:24 2018
+++ src/sys/netinet6/icmp6.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.223 2018/02/28 11:23:24 maxv Exp $ */
+/* $NetBSD: icmp6.c,v 1.224 2018/03/21 14:23:54 roy Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.223 2018/02/28 11:23:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.224 2018/03/21 14:23:54 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2014,7 +2014,7 @@ icmp6_rip6_input(struct mbuf **mp, int o
m_adj(n, off);
if (sbappendaddr(&last->in6p_socket->so_rcv,
sin6tosa(&rip6src), n, opts) == 0) {
- /* should notify about lost packet */
+ soroverflow(last->in6p_socket);
m_freem(n);
if (opts)
m_freem(opts);
@@ -2040,6 +2040,7 @@ icmp6_rip6_input(struct mbuf **mp, int o
m_adj(m, off);
if (sbappendaddr(&last->in6p_socket->so_rcv,
sin6tosa(&rip6src), m, opts) == 0) {
+ soroverflow(last->in6p_socket);
m_freem(m);
if (opts)
m_freem(opts);
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.194 src/sys/netinet6/ip6_input.c:1.195
--- src/sys/netinet6/ip6_input.c:1.194 Tue Mar 6 17:39:36 2018
+++ src/sys/netinet6/ip6_input.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.194 2018/03/06 17:39:36 maxv Exp $ */
+/* $NetBSD: ip6_input.c,v 1.195 2018/03/21 14:23:54 roy Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.194 2018/03/06 17:39:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.195 2018/03/21 14:23:54 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -1298,8 +1298,8 @@ ip6_notify_pmtu(struct in6pcb *in6p, con
if (sbappendaddr(&so->so_rcv, (const struct sockaddr *)dst, NULL, m_mtu)
== 0) {
+ soroverflow(so);
m_freem(m_mtu);
- /* XXX: should count statistics */
} else
sorwakeup(so);
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.122 src/sys/netinet6/ip6_mroute.c:1.123
--- src/sys/netinet6/ip6_mroute.c:1.122 Tue Feb 6 06:32:25 2018
+++ src/sys/netinet6/ip6_mroute.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.122 2018/02/06 06:32:25 maxv Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.123 2018/03/21 14:23:54 roy Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.122 2018/02/06 06:32:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.123 2018/03/21 14:23:54 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1016,6 +1016,7 @@ socket_send(struct socket *s, struct mbu
sorwakeup(s);
return 0;
}
+ soroverflow(s);
}
m_freem(mm);
return -1;
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.165 src/sys/netinet6/raw_ip6.c:1.166
--- src/sys/netinet6/raw_ip6.c:1.165 Wed Feb 28 11:23:24 2018
+++ src/sys/netinet6/raw_ip6.c Wed Mar 21 14:23:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.165 2018/02/28 11:23:24 maxv Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.166 2018/03/21 14:23:54 roy 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.165 2018/02/28 11:23:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.166 2018/03/21 14:23:54 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -205,7 +205,7 @@ rip6_input(struct mbuf **mp, int *offp,
m_adj(n, *offp);
if (sbappendaddr(&last->in6p_socket->so_rcv,
sin6tosa(&rip6src), n, opts) == 0) {
- /* should notify about lost packet */
+ soroverflow(last->in6p_socket);
m_freem(n);
if (opts)
m_freem(opts);
@@ -232,6 +232,7 @@ rip6_input(struct mbuf **mp, int *offp,
m_adj(m, *offp);
if (sbappendaddr(&last->in6p_socket->so_rcv,
sin6tosa(&rip6src), m, opts) == 0) {
+ soroverflow(last->in6p_socket);
m_freem(m);
if (opts)
m_freem(opts);
