summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-19 02:00:57 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-01-19 02:00:57 +0000
commit427aee5968a0dfd2b86ba129b330d5dbcedef563 (patch)
tree985871967f1b089998b8f4f79cccc78a2c95f252 /package
parent7141d869e6d6632d1011a89d564979840ff2ad92 (diff)
[package] ppp: don't die on malformed PADS frames that might appear on instable DSL lines
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25044 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/ppp/patches/350-survive_bad_pads_packets.patch109
2 files changed, 110 insertions, 1 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index eb7fd87679..4c5cac3978 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
PKG_VERSION:=2.4.4
-PKG_RELEASE:=15
+PKG_RELEASE:=16
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
diff --git a/package/ppp/patches/350-survive_bad_pads_packets.patch b/package/ppp/patches/350-survive_bad_pads_packets.patch
new file mode 100644
index 0000000000..66c656dc74
--- /dev/null
+++ b/package/ppp/patches/350-survive_bad_pads_packets.patch
@@ -0,0 +1,109 @@
+--- a/pppd/plugins/rp-pppoe/common.c
++++ b/pppd/plugins/rp-pppoe/common.c
+@@ -75,7 +75,9 @@ parsePacket(PPPoEPacket *packet, ParseFu
+ error("Invalid PPPoE tag length (%u)", tagLen);
+ return -1;
+ }
+- func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra);
++ if (func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra)) {
++ return -1;
++ }
+ curTag = curTag + TAG_HDR_SIZE + tagLen;
+ }
+ return 0;
+--- a/pppd/plugins/rp-pppoe/discovery.c
++++ b/pppd/plugins/rp-pppoe/discovery.c
+@@ -48,7 +48,7 @@ static char const RCSID[] =
+ *%DESCRIPTION:
+ * If a HostUnique tag is found which matches our PID, sets *extra to 1.
+ ***********************************************************************/
+-void
++int
+ parseForHostUniq(UINT16_t type, UINT16_t len, unsigned char *data,
+ void *extra)
+ {
+@@ -60,6 +60,7 @@ parseForHostUniq(UINT16_t type, UINT16_t
+ *val = 1;
+ }
+ }
++ return 0;
+ }
+
+ /**********************************************************************
+@@ -102,7 +103,7 @@ packetIsForMe(PPPoEConnection *conn, PPP
+ *%DESCRIPTION:
+ * Picks interesting tags out of a PADO packet
+ ***********************************************************************/
+-void
++int
+ parsePADOTags(UINT16_t type, UINT16_t len, unsigned char *data,
+ void *extra)
+ {
+@@ -181,6 +182,7 @@ parsePADOTags(UINT16_t type, UINT16_t le
+ }
+ break;
+ }
++ return 0;
+ }
+
+ /**********************************************************************
+@@ -195,7 +197,7 @@ parsePADOTags(UINT16_t type, UINT16_t le
+ *%DESCRIPTION:
+ * Picks interesting tags out of a PADS packet
+ ***********************************************************************/
+-void
++int
+ parsePADSTags(UINT16_t type, UINT16_t len, unsigned char *data,
+ void *extra)
+ {
+@@ -205,17 +207,21 @@ parsePADSTags(UINT16_t type, UINT16_t le
+ dbglog("PADS: Service-Name: '%.*s'", (int) len, data);
+ break;
+ case TAG_SERVICE_NAME_ERROR:
+- fatal("PADS: Service-Name-Error: %.*s", (int) len, data);
++ error("PADS: Service-Name-Error: %.*s", (int) len, data);
++ return -1;
+ case TAG_AC_SYSTEM_ERROR:
+- fatal("PADS: System-Error: %.*s", (int) len, data);
++ error("PADS: System-Error: %.*s", (int) len, data);
++ return -1;
+ case TAG_GENERIC_ERROR:
+- fatal("PADS: Generic-Error: %.*s", (int) len, data);
++ error("PADS: Generic-Error: %.*s", (int) len, data);
++ return -1;
+ case TAG_RELAY_SESSION_ID:
+ conn->relayId.type = htons(type);
+ conn->relayId.length = htons(len);
+ memcpy(conn->relayId.payload, data, len);
+ break;
+ }
++ return 0;
+ }
+
+ /***********************************************************************
+@@ -532,9 +538,11 @@ waitForPADS(PPPoEConnection *conn, int t
+ /* Is it PADS? */
+ if (packet.code == CODE_PADS) {
+ /* Parse for goodies */
+- parsePacket(&packet, parsePADSTags, conn);
+- conn->discoveryState = STATE_SESSION;
+- break;
++ if (!parsePacket(&packet, parsePADSTags, conn))
++ {
++ conn->discoveryState = STATE_SESSION;
++ break;
++ }
+ }
+ } while (conn->discoveryState != STATE_SESSION);
+
+--- a/pppd/plugins/rp-pppoe/pppoe.h
++++ b/pppd/plugins/rp-pppoe/pppoe.h
+@@ -238,7 +238,7 @@ typedef struct PPPoETagStruct {
+ #define READ_CHUNK 4096
+
+ /* Function passed to parsePacket */
+-typedef void ParseFunc(UINT16_t type,
++typedef int ParseFunc(UINT16_t type,
+ UINT16_t len,
+ unsigned char *data,
+ void *extra);