summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-03-20 09:12:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-28 22:31:47 +0100
commit95c29d7568ce210bd28747007f9bbca4ce354f1e (patch)
tree9f9b9e312b2000d933877d417d1dda92e0fb87ef /meta
parent8aa97a314d5ce53a60d20ec09e00546cfba86efd (diff)
downloadpoky-95c29d7568ce210bd28747007f9bbca4ce354f1e.tar.gz
wpa-supplicant: update CVE-2021-27803.patch
* update to match what was merged in master branch (and I have now sent for gatesgarth) * fixes Upstream-Status (there is a missing 'c' in 'Acepted' and 'Backport' is more accurate) (From OE-Core rev: 060587ae477d785db017f4d8a2152206c258da42) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch
index dc576d1a11..004b1dbd19 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/CVE-2021-27803.patch
@@ -18,15 +18,19 @@ p2p_add_device() so that the stale pointer cannot be used.
18Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") 18Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request")
19Signed-off-by: Jouni Malinen <jouni@codeaurora.org> 19Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
20 20
21Upstream-Status: Acepted [https://w1.fi/cgit/hostap/commit/?id=8460e3230988ef2ec13ce6b69b687e941f6cdb32] 21Upstream-Status: Backport
22CVE: CVE-2021-27803 22CVE: CVE-2021-27803
23Signed-off-by: Minjae Kim <flowergom@gmail.com> 23
24Reference to upstream patch:
25[https://w1.fi/cgit/hostap/commit/?id=8460e3230988ef2ec13ce6b69b687e941f6cdb32]
26
27Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
24--- 28---
25 src/p2p/p2p_pd.c | 12 +++++------- 29 src/p2p/p2p_pd.c | 12 +++++-------
26 1 file changed, 5 insertions(+), 7 deletions(-) 30 1 file changed, 5 insertions(+), 7 deletions(-)
27 31
28diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c 32diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
29index 3994ec03f86b..05fd593494ef 100644 33index 3994ec0..05fd593 100644
30--- a/src/p2p/p2p_pd.c 34--- a/src/p2p/p2p_pd.c
31+++ b/src/p2p/p2p_pd.c 35+++ b/src/p2p/p2p_pd.c
32@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, 36@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,
@@ -50,5 +54,5 @@ index 3994ec03f86b..05fd593494ef 100644
50 } else if (msg.wfd_subelems) { 54 } else if (msg.wfd_subelems) {
51 wpabuf_free(dev->info.wfd_subelems); 55 wpabuf_free(dev->info.wfd_subelems);
52-- 56--
532.25.1 572.17.1
54 58