From owner-svn-src-all@FreeBSD.ORG  Tue Dec 16 11:45:34 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 2D323247;
 Tue, 16 Dec 2014 11:45:34 +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 18C0F159A;
 Tue, 16 Dec 2014 11:45:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBGBjXk1035609;
 Tue, 16 Dec 2014 11:45:33 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBGBjXxe035608;
 Tue, 16 Dec 2014 11:45:33 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201412161145.sBGBjXxe035608@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 16 Dec 2014 11:45:33 +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: r275825 - stable/10/sys/netipsec
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Dec 2014 11:45:34 -0000

Author: ae
Date: Tue Dec 16 11:45:33 2014
New Revision: 275825
URL: https://svnweb.freebsd.org/changeset/base/275825

Log:
  MFC r275393:
    Remove unneded check. No need to do m_pullup to the size that we prepended.
  
  MFC r275473:
    Fix style(9) and remove m_freem(NULL).
    Add XXX comment, it looks incorrect, because m_pkthdr.len is already
    incremented by M_PREPEND().
  
  Sponsored by:	Yandex LLC

Modified:
  stable/10/sys/netipsec/keysock.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netipsec/keysock.c
==============================================================================
--- stable/10/sys/netipsec/keysock.c	Tue Dec 16 11:30:29 2014	(r275824)
+++ stable/10/sys/netipsec/keysock.c	Tue Dec 16 11:45:33 2014	(r275825)
@@ -149,14 +149,11 @@ key_sendup0(rp, m, promisc)
 		struct sadb_msg *pmsg;
 
 		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
-		if (m && m->m_len < sizeof(struct sadb_msg))
-			m = m_pullup(m, sizeof(struct sadb_msg));
-		if (!m) {
+		if (m == NULL) {
 			PFKEYSTAT_INC(in_nomem);
-			m_freem(m);
-			return ENOBUFS;
+			return (ENOBUFS);
 		}
-		m->m_pkthdr.len += sizeof(*pmsg);
+		m->m_pkthdr.len += sizeof(*pmsg); /* XXX: is this correct? */
 
 		pmsg = mtod(m, struct sadb_msg *);
 		bzero(pmsg, sizeof(*pmsg));