From owner-svn-src-head@FreeBSD.ORG  Tue Sep 30 07:28:31 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 EE2E1397;
 Tue, 30 Sep 2014 07:28:31 +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 DB632AC3;
 Tue, 30 Sep 2014 07:28:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8U7SVso020884;
 Tue, 30 Sep 2014 07:28:31 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8U7SVd8020883;
 Tue, 30 Sep 2014 07:28:31 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201409300728.s8U7SVd8020883@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Tue, 30 Sep 2014 07:28:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272296 - head/sys/netinet6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2014 07:28:32 -0000

Author: kevlo
Date: Tue Sep 30 07:28:31 2014
New Revision: 272296
URL: http://svnweb.freebsd.org/changeset/base/272296

Log:
  When plen != ulen, it should only be checked when this is UDP.
  
  Spotted by:	bryanv

Modified:
  head/sys/netinet6/udp6_usrreq.c

Modified: head/sys/netinet6/udp6_usrreq.c
==============================================================================
--- head/sys/netinet6/udp6_usrreq.c	Tue Sep 30 05:50:34 2014	(r272295)
+++ head/sys/netinet6/udp6_usrreq.c	Tue Sep 30 07:28:31 2014	(r272296)
@@ -232,7 +232,7 @@ udp6_input(struct mbuf **mp, int *offp, 
 		ulen = plen;
 		cscov_partial = 0;
 	}
-	if (plen != ulen) {
+	if (nxt == IPPROTO_UDP && plen != ulen) {
 		UDPSTAT_INC(udps_badlen);
 		goto badunlocked;
 	}