Module Name: src
Committed By: christos
Date: Tue May 19 15:14:26 UTC 2015
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: gssapi.c
Log Message:
Protect against a NULL pointer dereference described in:
https://www.altsci.com/ipsec/
XXX: pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/racoon/gssapi.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/racoon/gssapi.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/gssapi.c:1.4 src/crypto/dist/ipsec-tools/src/racoon/gssapi.c:1.5
--- src/crypto/dist/ipsec-tools/src/racoon/gssapi.c:1.4 Sat Sep 9 12:22:09 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/gssapi.c Tue May 19 11:14:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gssapi.c,v 1.4 2006/09/09 16:22:09 manu Exp $ */
+/* $NetBSD: gssapi.c,v 1.5 2015/05/19 15:14:25 christos Exp $ */
/* $KAME: gssapi.c,v 1.19 2001/04/03 15:51:55 thorpej Exp $ */
@@ -202,6 +202,10 @@ gssapi_init(struct ph1handle *iph1)
gssapi_set_state(iph1, gps);
+ if (iph1->rmconf == NULL) {
+ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
+ return -1;
+ }
if (iph1->rmconf->proposal->gssid != NULL) {
id_token.length = iph1->rmconf->proposal->gssid->l;
id_token.value = iph1->rmconf->proposal->gssid->v;
