diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2021-02-25 22:17:50 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2021-02-25 22:17:50 +0100 |
| commit | a71a9b00df36883b0ea0e05b1fab785f8b3364f2 (patch) | |
| tree | bb6434309f1790807f97c5b8bace8609e61ebd2c | |
| parent | 92e3f49b4c924446cd26d1603af695d4154cd8eb (diff) | |
SECURITY ISSUE: P2P: Fix a corner case in peer addition based on PD Request
See https://w1.fi/security/2021-1/
| -rw-r--r-- | debian/patches/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch | 50 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/debian/patches/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/debian/patches/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch new file mode 100644 index 0000000..1942bb3 --- /dev/null +++ b/debian/patches/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch @@ -0,0 +1,50 @@ +From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +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 <jouni@codeaurora.org> +--- + 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/debian/patches/series b/debian/patches/series index 87f00c5..1d4b715 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ upstream-fixes/0015-WPS-Reconfigure-credentials-on-hostapd-config-reload.patch upstream-fixes/0016-hostapd-Fix-error-message-for-radius_accept_attr-config-option.patch 2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch +2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch |