diff options
| author | John Crispin <blogic@openwrt.org> | 2014-09-18 15:24:22 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-09-18 15:24:22 +0000 |
| commit | d06df271fb99ab6b5193c359f2d02dc912c66fbc (patch) | |
| tree | f4b30a1c17c87e11db653f82fa4b831d5c00575f /package/network/services/ppp/patches/320-custom_iface_names.patch | |
| parent | 1dc0ebc894d49c2a095387c9706fae2c5b4f7c99 (diff) | |
| download | upstream-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/320-custom_iface_names.patch')
| -rw-r--r-- | package/network/services/ppp/patches/320-custom_iface_names.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/ppp/patches/320-custom_iface_names.patch b/package/network/services/ppp/patches/320-custom_iface_names.patch index 1b6561098b..ccda0c6760 100644 --- a/package/network/services/ppp/patches/320-custom_iface_names.patch +++ b/package/network/services/ppp/patches/320-custom_iface_names.patch @@ -56,7 +56,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> /* * Limits. */ -@@ -316,6 +320,7 @@ extern char *record_file; /* File to rec +@@ -317,6 +321,7 @@ extern char *record_file; /* File to rec extern bool sync_serial; /* Device is synchronous serial device */ extern int maxfail; /* Max # of unsuccessful connection attempts */ extern char linkname[MAXPATHLEN]; /* logical name for link */ @@ -77,7 +77,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> static int tty_disc = N_TTY; /* The TTY discipline */ static int ppp_disc = N_PPP; /* The PPP discpline */ static int initfdflags = -1; /* Initial file descriptor flags for fd */ -@@ -615,7 +619,8 @@ void generic_disestablish_ppp(int dev_fd +@@ -620,7 +624,8 @@ void generic_disestablish_ppp(int dev_fd */ static int make_ppp_unit() { @@ -87,7 +87,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> if (ppp_dev_fd >= 0) { dbglog("in make_ppp_unit, already had /dev/ppp open?"); -@@ -638,6 +643,30 @@ static int make_ppp_unit() +@@ -643,6 +648,30 @@ static int make_ppp_unit() } if (x < 0) error("Couldn't create new ppp unit: %m"); |