hostapd: P2P: Fix a corner case in peer addition based on PD Request
authorStefan Lippers-Hollmann <>
Sat, 27 Feb 2021 22:55:08 +0000 (23:55 +0100)
committerHauke Mehrtens <>
Sat, 6 Mar 2021 14:48:43 +0000 (15:48 +0100)
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.

This fixes the following security vulnerabilities/bugs:

- CVE-2021-27803 - A vulnerability was discovered in how p2p/p2p_pd.c
  in wpa_supplicant before 2.10 processes P2P (Wi-Fi Direct) provision
  discovery requests. It could result in denial of service or other
  impact (potentially execution of arbitrary code), for an attacker
  within radio range.

Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request")
Signed-off-by: Jouni Malinen <>
Signed-off-by: Stefan Lippers-Hollmann <>
(cherry picked from commit 1ca5de13a153061feae260864d73d96f7c463785)

package/network/services/hostapd/patches/060-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch [new file with mode: 0644]

index a4002f7ed754cb4dc61cf1f26744926f9e99349c..75615efd9b91cd692fe1489e9561c01119c0283b 100644 (file)
@@ -7,7 +7,7 @@
 include $(TOPDIR)/
diff --git a/package/network/services/hostapd/patches/060-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/package/network/services/hostapd/patches/060-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
new file mode 100644 (file)
index 0000000..1202ff3
--- /dev/null
@@ -0,0 +1,45 @@
+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(-)
+--- a/src/p2p/p2p_pd.c
++++ b/src/p2p/p2p_pd.c
+@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2
+                       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);