forked from jsonn/pkgsrc
-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Protect against a NULL pointer dereference described in:
https://www.altsci.com/ipsec/ Patch obtained from src/crypto/dist/ipsec-tools/src/racoon/gssapi.c Bump PKGREVISION
- Loading branch information
sevan
committed
May 19, 2015
1 parent
9e81f83
commit e64105f
Showing
3 changed files
with
23 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
$NetBSD: distinfo,v 1.16 2010/03/06 09:07:15 spz Exp $ | ||
$NetBSD: distinfo,v 1.17 2015/05/19 15:45:44 sevan Exp $ | ||
|
||
SHA1 (ipsec-tools-0.7.3.tar.bz2) = 19dc160643547a0bfabf0fe0ad1a181d3c28f410 | ||
RMD160 (ipsec-tools-0.7.3.tar.bz2) = e0ff32f0daa845934ac868ad5f36d58b25919c30 | ||
Size (ipsec-tools-0.7.3.tar.bz2) = 776096 bytes | ||
SHA1 (patch-src_racoon_gssapi.c) = 6294956137e91749feee8de9da696c492fe786b9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
$NetBSD: patch-src_racoon_gssapi.c,v 1.1 2015/05/19 15:45:44 sevan Exp $ | ||
|
||
Protect against a NULL pointer dereference described in: | ||
https://www.altsci.com/ipsec/ | ||
|
||
--- src/racoon/gssapi.c.orig 2015-05-19 15:28:49.000000000 +0000 | ||
+++ src/racoon/gssapi.c | ||
@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) | ||
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"); |