Module Name: src
Committed By: christos
Date: Mon Mar 7 13:08:48 UTC 2016
Modified Files:
src/sys/netipsec: key.c
Log Message:
PR/50905: Henning Petersen: Fix useless comparison (from FreeBSD)
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/netipsec/key.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.96 src/sys/netipsec/key.c:1.97
--- src/sys/netipsec/key.c:1.96 Sat Mar 5 23:19:51 2016
+++ src/sys/netipsec/key.c Mon Mar 7 08:08:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.96 2016/03/06 04:19:51 christos Exp $ */
+/* $NetBSD: key.c,v 1.97 2016/03/07 13:08:48 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.96 2016/03/06 04:19:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.97 2016/03/07 13:08:48 christos Exp $");
/*
* This code is referd to RFC 2367
@@ -7333,6 +7333,7 @@ key_parse(struct mbuf *m, struct socket
{
struct sadb_msg *msg;
struct sadb_msghdr mh;
+ u_int orglen;
int error;
int target;
@@ -7352,10 +7353,11 @@ key_parse(struct mbuf *m, struct socket
return ENOBUFS;
}
msg = mtod(m, struct sadb_msg *);
+ 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) {
+ m->m_pkthdr.len != orglen) {
ipseclog((LOG_DEBUG, "key_parse: invalid message length.\n"));
PFKEY_STATINC(PFKEY_STAT_OUT_INVLEN);
error = EINVAL;
