[src/netbsd-7]: src/crypto/dist/ipsec-tools/src/racoon Pull up following revi...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81daa236d23f
branches:  netbsd-7
changeset: 799359:81daa236d23f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed May 20 02:45:17 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #792):
        crypto/dist/ipsec-tools/src/racoon/gssapi.c: revision 1.5
        crypto/dist/ipsec-tools/src/racoon/gssapi.c: revision 1.6
Protect against a NULL pointer dereference described in:
    https://www.altsci.com/ipsec/
XXX: pullup-7
Detect error earlier to avoid memory leak.
XXX: pullup-7

diffstat:

 crypto/dist/ipsec-tools/src/racoon/gssapi.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 877857010203 -r 81daa236d23f crypto/dist/ipsec-tools/src/racoon/gssapi.c
--- a/crypto/dist/ipsec-tools/src/racoon/gssapi.c       Tue May 19 14:16:33 2015 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/gssapi.c       Wed May 20 02:45:17 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gssapi.c,v 1.4 2006/09/09 16:22:09 manu Exp $  */
+/*     $NetBSD: gssapi.c,v 1.4.66.1 2015/05/20 02:45:17 msaitoh Exp $  */
 
 /*     $KAME: gssapi.c,v 1.19 2001/04/03 15:51:55 thorpej Exp $        */
 
@@ -192,6 +192,11 @@
        gss_name_t princ, canon_princ;
        OM_uint32 maj_stat, min_stat;
 
+       if (iph1->rmconf == NULL) {
+               plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
+               return -1;
+       }
+
        gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
        if (gps == NULL) {
                plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");