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

Andrey V. Elsukov ae at FreeBSD.org
Wed Mar 9 10:01:30 UTC 2016


Author: ae
Date: Wed Mar  9 10:01:28 2016
New Revision: 296558
URL: https://svnweb.freebsd.org/changeset/base/296558

Log:
  MFC r295967:
    Fix useless check. m_pkthdr.len should be equal to orglen.

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

Modified: stable/10/sys/netipsec/key.c
==============================================================================
--- stable/10/sys/netipsec/key.c	Wed Mar  9 09:12:40 2016	(r296557)
+++ stable/10/sys/netipsec/key.c	Wed Mar  9 10:01:28 2016	(r296558)
@@ -7245,8 +7245,7 @@ key_parse(struct mbuf *m, struct socket 
 	orglen = PFKEY_UNUNIT64(msg->sadb_msg_len);
 	target = KEY_SENDUP_ONE;
 
-	if ((m->m_flags & M_PKTHDR) == 0 ||
-	    m->m_pkthdr.len != m->m_pkthdr.len) {
+	if ((m->m_flags & M_PKTHDR) == 0 || m->m_pkthdr.len != orglen) {
 		ipseclog((LOG_DEBUG, "%s: invalid message length.\n",__func__));
 		PFKEYSTAT_INC(out_invlen);
 		error = EINVAL;


More information about the svn-src-all mailing list