aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-09-18 15:24:22 +0000
committerJohn Crispin <blogic@openwrt.org>2014-09-18 15:24:22 +0000
commitd06df271fb99ab6b5193c359f2d02dc912c66fbc (patch)
treef4b30a1c17c87e11db653f82fa4b831d5c00575f /package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
parent1dc0ebc894d49c2a095387c9706fae2c5b4f7c99 (diff)
downloadupstream-d06df271fb99ab6b5193c359f2d02dc912c66fbc.tar.gz
upstream-d06df271fb99ab6b5193c359f2d02dc912c66fbc.tar.bz2
upstream-d06df271fb99ab6b5193c359f2d02dc912c66fbc.zip
ppp: update to version 2.4.7
This fixes: CVE-2014-3158 and some other bugs. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Backport of r42525 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42613 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch')
-rw-r--r--package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
index d7f95590c2..bba5884fa4 100644
--- a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
+++ b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
@@ -118,7 +118,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
&& memcmp(vd.dptr, key.dptr, vd.dsize) == 0;
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
-@@ -693,6 +693,16 @@ void cfg_bundle(int mrru, int mtru, int
+@@ -698,6 +698,16 @@ void cfg_bundle(int mrru, int mtru, int
add_fd(ppp_dev_fd);
}
@@ -135,7 +135,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
/*
* make_new_bundle - create a new PPP unit (i.e. a bundle)
* and connect our channel to it. This should only get called
-@@ -711,6 +721,8 @@ void make_new_bundle(int mrru, int mtru,
+@@ -716,6 +726,8 @@ void make_new_bundle(int mrru, int mtru,
/* set the mrru and flags */
cfg_bundle(mrru, mtru, rssn, tssn);