From 941d4fb9880828d17c6cb1eab9dfa0674ed9738eb7ef3e4ea9443b8e8d7bb3c1 Mon Sep 17 00:00:00 2001 From: Clemens Famulla-Conrad Date: Sat, 27 Feb 2021 23:26:49 +0000 Subject: [PATCH] Accepting request 875680 from home:cfconrad:branches:hardware - Add CVE-2021-27803.patch -- P2P provision discovery processing vulnerability (bsc#1182805) OBS-URL: https://build.opensuse.org/request/show/875680 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=122 --- CVE-2021-27803.patch | 50 ++++++++++++++++++++++++++++++++++++++++++ wpa_supplicant.changes | 6 +++++ wpa_supplicant.spec | 1 + 3 files changed, 57 insertions(+) create mode 100644 CVE-2021-27803.patch diff --git a/CVE-2021-27803.patch b/CVE-2021-27803.patch new file mode 100644 index 0000000..3dba865 --- /dev/null +++ b/CVE-2021-27803.patch @@ -0,0 +1,50 @@ +From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 8 Dec 2020 23:52:50 +0200 +Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request + +p2p_add_device() may remove the oldest entry if there is no room in the +peer table for a new peer. This would result in any pointer to that +removed entry becoming stale. A corner case with an invalid PD Request +frame could result in such a case ending up using (read+write) freed +memory. This could only by triggered when the peer table has reached its +maximum size and the PD Request frame is received from the P2P Device +Address of the oldest remaining entry and the frame has incorrect P2P +Device Address in the payload. + +Fix this by fetching the dev pointer again after having called +p2p_add_device() so that the stale pointer cannot be used. + +Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") +Signed-off-by: Jouni Malinen +--- + src/p2p/p2p_pd.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c +index 3994ec03f86b..05fd593494ef 100644 +--- a/src/p2p/p2p_pd.c ++++ b/src/p2p/p2p_pd.c +@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, + goto out; + } + ++ dev = p2p_get_device(p2p, sa); + if (!dev) { +- dev = p2p_get_device(p2p, sa); +- if (!dev) { +- p2p_dbg(p2p, +- "Provision Discovery device not found " +- MACSTR, MAC2STR(sa)); +- goto out; +- } ++ p2p_dbg(p2p, ++ "Provision Discovery device not found " ++ MACSTR, MAC2STR(sa)); ++ goto out; + } + } else if (msg.wfd_subelems) { + wpabuf_free(dev->info.wfd_subelems); +-- +2.25.1 + diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index 88100ba..8fcd363 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 27 23:14:13 UTC 2021 - Clemens Famulla-Conrad + +- Add CVE-2021-27803.patch -- P2P provision discovery processing vulnerability + (bsc#1182805) + ------------------------------------------------------------------- Thu Feb 4 12:27:02 UTC 2021 - Clemens Famulla-Conrad diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index e89ca53..ed4269d 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -43,6 +43,7 @@ Patch6: restore-old-dbus-interface.patch Patch7: CVE-2019-16275.patch Patch8: wpa_supplicant-p2p_iname_size.diff Patch9: CVE-2021-0326.patch +Patch10: CVE-2021-27803.patch BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: systemd-rpm-macros