aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-04-03 19:06:45 +0000
committerJohn Crispin <john@openwrt.org>2015-04-03 19:06:45 +0000
commit9ccfbb841c01b1d15270374a3ce07641267b730d (patch)
treeb04c9d6fdf3b02c9dca4eff09f162dc338f8a0ea /package/network/services
parent4ad0ad981741ac2fe424d5ec4a5d079f653da0b6 (diff)
downloadupstream-9ccfbb841c01b1d15270374a3ce07641267b730d.tar.gz
upstream-9ccfbb841c01b1d15270374a3ce07641267b730d.tar.bz2
upstream-9ccfbb841c01b1d15270374a3ce07641267b730d.zip
ppp: Fix seg fault when using pppol2tp
PPPD crashes (SEGV) when the dump or dryrun options are specified and an option is internally defined as "o_special" with an option flag of "OPT_A2STRVAL". As the option value is not saved when the parameter is processed, a reference to the option will result into a crash (e.g. when printing). Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> SVN-Revision: 45263
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch b/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch
new file mode 100644
index 0000000000..7dd2ad844c
--- /dev/null
+++ b/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch
@@ -0,0 +1,13 @@
+--- a/pppd/plugins/pppol2tp/pppol2tp.c
++++ b/pppd/plugins/pppol2tp/pppol2tp.c
+@@ -148,6 +148,10 @@ static int setdevname_pppol2tp(char **ar
+ fatal("PPPoL2TP kernel driver not installed");
+ }
+
++ pppol2tp_fd_str = strdup(*argv);
++ if (pppol2tp_fd_str == NULL)
++ novm("PPPoL2TP FD");
++
+ /* Setup option defaults. Compression options are disabled! */
+
+ modem = 0;