From: John Crispin <john@openwrt.org>
Date: Fri, 3 Apr 2015 19:06:45 +0000 (+0000)
Subject: ppp: Fix seg fault when using pppol2tp
X-Git-Tag: reboot~3474
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9ccfbb841c01b1d15270374a3ce07641267b730d;p=openwrt%2Fstaging%2Fblogic.git

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
---

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 000000000000..7dd2ad844cba
--- /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;