diff --git a/SOURCES/rh1933568-0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/SOURCES/rh1933568-0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
new file mode 100644
index 0000000..1942bb3
--- /dev/null
+++ b/SOURCES/rh1933568-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/SPECS/wpa_supplicant.spec b/SPECS/wpa_supplicant.spec
index d41dcfc..c5c500e 100644
--- a/SPECS/wpa_supplicant.spec
+++ b/SPECS/wpa_supplicant.spec
@@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.6
-Release: 12%{?dist}
+Release: 12%{?dist}.2
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -97,6 +97,8 @@ Patch56: rh1434434-wpa_supplicant-Don-t-reply-to-EAPOL-if-pkt_type-is-P.patch
 Patch57: rh1490885-fix-auth-failure-when-the-mac-is-updated-externally.patch
 Patch58: rh1500442-wpa_supplicant-Fix-memory-leaks-in-ieee802_1x_create.patch
 Patch59: rh1619553-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+# fix for CVE-2021-27803
+Patch60: rh1933568-0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 
 URL: http://w1.fi/wpa_supplicant/
 
@@ -196,6 +198,7 @@ cp %{SOURCE8} src/linux/if_link.h
 %patch57 -p1 -b .rh1490885-mac-changed-event
 %patch58 -p1 -b .rh1500442-macsec-memleak
 %patch59 -p1 -b .rh1619553-ignore-unauth-eapol
+%patch60 -p1 -b .rh1933568
 
 %build
 pushd wpa_supplicant
@@ -303,6 +306,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar  8 2021 Davide Caratti <dcaratti@redhat.com> - 1:2.6-12.1
+- P2P: Fix a corner case in peer addition based on PD Request (CVE-2021-27803)
+
 * Tue Aug 28 2018 Davide Caratti <dcaratti@redhat.com> - 1:2.6-12
 - Ignore unauthenticated encrypted EAPOL-Key data (CVE-2018-14526)