svn commit: r275825 - stable/10/sys/netipsec

[Andrey V. Elsukov]

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));