CVS commit: src/crypto/dist/ipsec-tools/src/setkey

[Matthias Drochner]

Module Name:    src
Committed By:   drochner
Date:           Fri May 27 18:00:21 UTC 2011

Modified Files:
        src/crypto/dist/ipsec-tools/src/setkey: setkey.c

Log Message:
replace questionable pointer games which could cause reads of
uninitialized memory, from Wolfgang Stukenbrock per PR bin/44951


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/dist/ipsec-tools/src/setkey/setkey.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.c
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.14 src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.15
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.14	Thu Aug  6 04:44:43 2009
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.c	Fri May 27 18:00:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: setkey.c,v 1.14 2009/08/06 04:44:43 tteras Exp $	*/
+/*	$NetBSD: setkey.c,v 1.15 2011/05/27 18:00:21 drochner Exp $	*/
 
 /*	$KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $	*/
 
@@ -753,12 +753,6 @@
 			else
 				pfkey_sadump(msg);
 		}
-		msg = (struct sadb_msg *)((caddr_t)msg +
-				     PFKEY_UNUNIT64(msg->sadb_msg_len));
-		if (f_verbose) {
-			kdebug_sadb((struct sadb_msg *)msg);
-			printf("\n");
-		}
 		break;
 
 	case SADB_X_SPDGET:
@@ -773,13 +767,6 @@
 			pfkey_spdump_withports(msg);
 		else
 			pfkey_spdump(msg);
-		if (msg->sadb_msg_seq == 0) break;
-		msg = (struct sadb_msg *)((caddr_t)msg +
-				     PFKEY_UNUNIT64(msg->sadb_msg_len));
-		if (f_verbose) {
-			kdebug_sadb((struct sadb_msg *)msg);
-			printf("\n");
-		}
 		break;
 #ifdef HAVE_PFKEY_POLICY_PRIORITY
 	case SADB_X_SPDADD:
@@ -867,6 +854,10 @@
 	while (p < ep) {
 		msg = (struct sadb_msg *)p;
 		len = PFKEY_UNUNIT64(msg->sadb_msg_len);
+		if (f_verbose) {
+			kdebug_sadb((struct sadb_msg *)msg);
+			printf("\n");
+		}
 		postproc(msg, len);
 		p += len;
 	}