diff options
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch | 29 | ||||
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch b/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch new file mode 100644 index 0000000000..c9edb30597 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | ppp: Buffer overflow in radius plugin | ||
2 | |||
3 | From: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=782450 | ||
4 | |||
5 | Upstream-Status: Backport | ||
6 | |||
7 | On systems with more than 65535 processes running, pppd aborts when | ||
8 | sending a "start" accounting message to the RADIUS server because of a | ||
9 | buffer overflow in rc_mksid. | ||
10 | |||
11 | The process id is used in rc_mksid to generate a pseudo-unique string, | ||
12 | assuming that the hex representation of the pid will be at most 4 | ||
13 | characters (FFFF). __sprintf_chk(), used when compiling with | ||
14 | optimization levels greater than 0 and FORTIFY_SOURCE, detects the | ||
15 | buffer overflow and makes pppd crash. | ||
16 | |||
17 | The following patch fixes the problem. | ||
18 | |||
19 | --- ppp-2.4.6.orig/pppd/plugins/radius/util.c | ||
20 | +++ ppp-2.4.6/pppd/plugins/radius/util.c | ||
21 | @@ -77,7 +77,7 @@ rc_mksid (void) | ||
22 | static unsigned short int cnt = 0; | ||
23 | sprintf (buf, "%08lX%04X%02hX", | ||
24 | (unsigned long int) time (NULL), | ||
25 | - (unsigned int) getpid (), | ||
26 | + (unsigned int) getpid () % 65535, | ||
27 | cnt & 0xFF); | ||
28 | cnt++; | ||
29 | return buf; | ||
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 4219d45591..adc38e10b4 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb | |||
@@ -29,6 +29,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ | |||
29 | file://provider \ | 29 | file://provider \ |
30 | file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ | 30 | file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ |
31 | file://ppp@.service \ | 31 | file://ppp@.service \ |
32 | file://fix-CVE-2015-3310.patch \ | ||
32 | " | 33 | " |
33 | 34 | ||
34 | SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a" | 35 | SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a" |