diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-05 17:42:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-08 10:10:15 +0000 |
commit | 2961717078ccecd2a223c03eed1902024c9cdd15 (patch) | |
tree | a64acb72c714585400734254bbe8ce828f2b6b86 /meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch | |
parent | c5f7310d6fe4bafffc89142e0b3b236d8296a700 (diff) | |
download | poky-2961717078ccecd2a223c03eed1902024c9cdd15.tar.gz |
ppp: Update 2.4.8 -> 2.4.9
This is the first ppp release in a long time. Many patches
were resolved upstream:
* musl fixes were merged
* EAP patch was a backport added upstream
* cflags were fixed upstream
* CVE fix was merged upstream and a backport
* pcap header from the host was fixed upstream
* suid bits during install was removed upstream
The only patch left was the /var/ redirect for resolv.conf which no longer
applied cleanly after upstream changes. For this one the patch will
need to be rewritten (and preferably submitted upstream) by someone
who needs/uses it. It was presumbaly for RO rootfs and may be resolved
by symlinks in modern system usage anyway.
Tweak the files pulled into the pppoe package for a compatibility
symlink and module rename.
Add CC to the OEMAKE command to allow builds correctly.
[Big thanks to Alex Kanavin for a lot of the work with upstream and
pre-release testing of this]
(From OE-Core rev: b524ba3e7941b9112ae4b6ae4aa7795c59ff0d16)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch deleted file mode 100644 index b7ba7ba643..0000000000 --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Mackerras <paulus@ozlabs.org> | ||
3 | Date: Mon, 3 Feb 2020 15:53:28 +1100 | ||
4 | Subject: [PATCH] pppd: Fix bounds check in EAP code | ||
5 | |||
6 | Given that we have just checked vallen < len, it can never be the case | ||
7 | that vallen >= len + sizeof(rhostname). This fixes the check so we | ||
8 | actually avoid overflowing the rhostname array. | ||
9 | |||
10 | Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> | ||
11 | Signed-off-by: Paul Mackerras <paulus@ozlabs.org> | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | [https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426] | ||
15 | |||
16 | CVE: CVE-2020-8597 | ||
17 | |||
18 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
19 | --- | ||
20 | pppd/eap.c | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/pppd/eap.c b/pppd/eap.c | ||
24 | index 94407f5..1b93db0 100644 | ||
25 | --- a/pppd/eap.c | ||
26 | +++ b/pppd/eap.c | ||
27 | @@ -1420,7 +1420,7 @@ int len; | ||
28 | } | ||
29 | |||
30 | /* Not so likely to happen. */ | ||
31 | - if (vallen >= len + sizeof (rhostname)) { | ||
32 | + if (len - vallen >= sizeof (rhostname)) { | ||
33 | dbglog("EAP: trimming really long peer name down"); | ||
34 | BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); | ||
35 | rhostname[sizeof (rhostname) - 1] = '\0'; | ||
36 | @@ -1846,7 +1846,7 @@ int len; | ||
37 | } | ||
38 | |||
39 | /* Not so likely to happen. */ | ||
40 | - if (vallen >= len + sizeof (rhostname)) { | ||
41 | + if (len - vallen >= sizeof (rhostname)) { | ||
42 | dbglog("EAP: trimming really long peer name down"); | ||
43 | BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); | ||
44 | rhostname[sizeof (rhostname) - 1] = '\0'; | ||
45 | -- | ||
46 | 2.17.1 | ||
47 | |||