diff options
| author | Nicolas Thill <nico@openwrt.org> | 2015-05-24 20:38:44 +0200 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2015-05-24 20:38:44 +0200 |
| commit | d8362b6d049a1e64b5294078e1e069697ff80df5 (patch) | |
| tree | a01281dbc3109f2aaa4ae439a0980dce73832723 /net/ipsec-tools/patches | |
| parent | 75d8f0924c0d28d594bc8a6ced17c426815abf0f (diff) | |
ipsec-tools: fix null dereference in racoon
* add a patch to fix a null pointer dereference in src/racoon/gssapi.c (CVE-2015-4047)
* refresh patches
* bumb release number
Signed-off-by: Nicolas Thill <nico@openwrt.org>
Diffstat (limited to 'net/ipsec-tools/patches')
| -rw-r--r-- | net/ipsec-tools/patches/002-patch8-utmp.patch | 4 | ||||
| -rw-r--r-- | net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch | 2 | ||||
| -rw-r--r-- | net/ipsec-tools/patches/007-force_have_policy_fwd.patch (renamed from net/ipsec-tools/patches/force_HAVE_POLICY_FWD) | 4 | ||||
| -rw-r--r-- | net/ipsec-tools/patches/008-racoon-fix_dereference_crash.patch | 16 |
4 files changed, 20 insertions, 6 deletions
diff --git a/net/ipsec-tools/patches/002-patch8-utmp.patch b/net/ipsec-tools/patches/002-patch8-utmp.patch index 16dc9237c..547539043 100644 --- a/net/ipsec-tools/patches/002-patch8-utmp.patch +++ b/net/ipsec-tools/patches/002-patch8-utmp.patch @@ -9,7 +9,7 @@ #if defined(__APPLE__) && defined(__MACH__) #include <util.h> #endif -@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr +@@ -1664,7 +1664,8 @@ isakmp_cfg_accounting_system(port, raddr int inout; { int error = 0; @@ -19,7 +19,7 @@ char addr[NI_MAXHOST]; if (usr == NULL || usr[0]=='\0') { -@@ -1670,34 +1671,37 @@ isakmp_cfg_accounting_system(port, raddr +@@ -1673,34 +1674,37 @@ isakmp_cfg_accounting_system(port, raddr return -1; } diff --git a/net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch b/net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch index 443d38d5e..7174300da 100644 --- a/net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch +++ b/net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch @@ -1,6 +1,6 @@ --- a/src/racoon/ipsec_doi.c +++ b/src/racoon/ipsec_doi.c -@@ -3582,8 +3582,8 @@ ipsecdoi_checkid1(iph1) +@@ -3581,8 +3581,8 @@ ipsecdoi_checkid1(iph1) iph1->approval->authmethod == OAKLEY_ATTR_AUTH_METHOD_PSKEY) { if (id_b->type != IPSECDOI_ID_IPV4_ADDR && id_b->type != IPSECDOI_ID_IPV6_ADDR) { diff --git a/net/ipsec-tools/patches/force_HAVE_POLICY_FWD b/net/ipsec-tools/patches/007-force_have_policy_fwd.patch index 24e64458b..69cd1c039 100644 --- a/net/ipsec-tools/patches/force_HAVE_POLICY_FWD +++ b/net/ipsec-tools/patches/007-force_have_policy_fwd.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index 8506245..eca8895 100644 --- a/configure.ac +++ b/configure.ac -@@ -724,7 +724,8 @@ case $host in +@@ -732,7 +732,8 @@ case $host in ], [AC_MSG_RESULT(yes) AC_DEFINE([HAVE_POLICY_FWD], [], [Have forward policy])], diff --git a/net/ipsec-tools/patches/008-racoon-fix_dereference_crash.patch b/net/ipsec-tools/patches/008-racoon-fix_dereference_crash.patch new file mode 100644 index 000000000..5e3a2d4dd --- /dev/null +++ b/net/ipsec-tools/patches/008-racoon-fix_dereference_crash.patch @@ -0,0 +1,16 @@ +Fix null dereference in racoon/gssapi.c (CVE-2015-4047) + +--- a/src/racoon/gssapi.c ++++ b/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"); |