From owner-svn-src-stable-10@FreeBSD.ORG  Sat Nov  8 02:40:01 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BDACB9A8;
 Sat,  8 Nov 2014 02:40:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A95ECE36;
 Sat,  8 Nov 2014 02:40:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA82e1da013107;
 Sat, 8 Nov 2014 02:40:01 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA82e1AZ013106;
 Sat, 8 Nov 2014 02:40:01 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201411080240.sA82e1AZ013106@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bryanv set sender to
 bryanv@FreeBSD.org using -f
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Sat, 8 Nov 2014 02:40:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r274264 - stable/10/sys/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2014 02:40:01 -0000

Author: bryanv
Date: Sat Nov  8 02:40:00 2014
New Revision: 274264
URL: https://svnweb.freebsd.org/changeset/base/274264

Log:
  MFC r272797:
  
  Check for mbuf copy failure when there are multiple multicast sockets
  
  This partitular case is the only path where the mbuf could be NULL.
  udp_append() checked for a NULL mbuf only after invoking the tunneling
  callback. Our only in tree tunneling callback - SCTP - assumed a non
  NULL mbuf, and it is a bit odd to make the callbacks responsible for
  checking this condition.
  
  This also reduces the differences between the IPv4 and IPv6 code.

Modified:
  stable/10/sys/netinet/udp_usrreq.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/udp_usrreq.c
==============================================================================
--- stable/10/sys/netinet/udp_usrreq.c	Sat Nov  8 00:55:06 2014	(r274263)
+++ stable/10/sys/netinet/udp_usrreq.c	Sat Nov  8 02:40:00 2014	(r274264)
@@ -307,9 +307,6 @@ udp_append(struct inpcb *inp, struct ip 
 		return;
 	}
 
-	if (n == NULL)
-		return;
-
 	off += sizeof(struct udphdr);
 
 #ifdef IPSEC
@@ -568,8 +565,10 @@ udp_input(struct mbuf *m, int off)
 			if (last != NULL) {
 				struct mbuf *n;
 
-				n = m_copy(m, 0, M_COPYALL);
-				udp_append(last, ip, n, iphlen, &udp_in);
+				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
+					udp_append(last, ip, n, iphlen,
+					    &udp_in);
+				}
 				INP_RUNLOCK(last);
 			}
 			last = inp;