From 74e1ebacbf29188a4d41381d83b2bb47e593b241 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 26 Feb 2020 04:04:05 +0000 Subject: user/ppp: [CVE!] Bump to 2.4.8 --- user/ppp/32_all_pado-timeout.patch | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'user/ppp/32_all_pado-timeout.patch') diff --git a/user/ppp/32_all_pado-timeout.patch b/user/ppp/32_all_pado-timeout.patch index 72f1adbb1..e17658456 100644 --- a/user/ppp/32_all_pado-timeout.patch +++ b/user/ppp/32_all_pado-timeout.patch @@ -218,37 +218,3 @@ /* Is it PADS? */ if (packet.code == CODE_PADS) { /* Parse for goodies */ ---- ppp-2.4.6/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include "pppoe.h" - -@@ -513,6 +514,8 @@ - struct timeval tv; - PPPoEPacket packet; - int len; -+ time_t start, now; -+ int time_remain; - - struct PacketCriteria pc; - pc.conn = conn; -@@ -522,9 +525,13 @@ - pc.seenServiceName = 0; - conn->error = 0; - -+ time(&start); - do { -+ time(&now); -+ time_remain = timeout - (int)difftime(now, start); -+ if (time_remain <= 0) return; /* Timed out */ - if (BPF_BUFFER_IS_EMPTY) { -- tv.tv_sec = timeout; -+ tv.tv_sec = time_remain; - tv.tv_usec = 0; - - FD_ZERO(&readable); -- cgit v1.2.3-70-g09d2