Skip to contentSkip to conversation

package/hostapd: add upstream patch to fix CVE-2021-27803

PATCH New Sam Voss 5 participants 6 messages Jun 1, 2021 – Jun 10, 2021

lore
Share & tools
lore

Sam Voss

author
#0 lore raw

PATCH 1/1 package/hostapd: add upstream patch to fix CVE-2021-27803

Fixes the following:

- 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.

---
 package/hostapd/hostapd.hash | 1 +
 package/hostapd/hostapd.mk   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
package/hostapd/hostapd.hash +1 -0
index e2f76c12d9..9ac5f4b392 100644
@@ -3,4 +3,5 @@ sha256  881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7  hostap
 sha256  2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7  0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 sha256  49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de  0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
 sha256  a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a  0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+sha256  7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611  0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 sha256  9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761  README
package/hostapd/hostapd.mk +5 -1
index 8eff92eb1e..8820254f89 100644
@@ -11,7 +11,8 @@ HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_PATCH = \
 	https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \
 	https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \
-	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \
+	https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 HOSTAPD_DEPENDENCIES = host-pkgconf
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS)
 HOSTAPD_LICENSE = BSD-3-Clause
@@ -26,6 +27,9 @@ HOSTAPD_IGNORE_CVES += CVE-2020-12695
 # 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch
 HOSTAPD_IGNORE_CVES += CVE-2021-30004
 
+# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
+HOSTAPD_IGNORE_CVES += CVE-2021-27803
+
 HOSTAPD_CPE_ID_VENDOR = w1.fi
 HOSTAPD_CONFIG_SET =
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/hostapd: add upstream patch to fix CVE-2021-27803

Quoted 9 lines · Sam Voss via buildroot

Fixes the following:

- 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.

Applied to master, thanks.

Regards,
Arnout

Quoted 40 lines
---
 package/hostapd/hostapd.hash | 1 +
 package/hostapd/hostapd.mk   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
package/hostapd/hostapd.hash +1 -0
index e2f76c12d9..9ac5f4b392 100644
@@ -3,4 +3,5 @@ sha256  881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7  hostap
 sha256  2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7  0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 sha256  49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de  0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
 sha256  a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a  0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+sha256  7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611  0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 sha256  9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761  README
package/hostapd/hostapd.mk +5 -1
index 8eff92eb1e..8820254f89 100644
@@ -11,7 +11,8 @@ HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_PATCH = \
 	https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \
 	https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \
-	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \
+	https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 HOSTAPD_DEPENDENCIES = host-pkgconf
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS)
 HOSTAPD_LICENSE = BSD-3-Clause
@@ -26,6 +27,9 @@ HOSTAPD_IGNORE_CVES += CVE-2020-12695
 # 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch
 HOSTAPD_IGNORE_CVES += CVE-2021-30004
 
+# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
+HOSTAPD_IGNORE_CVES += CVE-2021-27803
+
 HOSTAPD_CPE_ID_VENDOR = w1.fi
 HOSTAPD_CONFIG_SET =
 
#2 lore raw

PATCH 1/1 package/hostapd: add upstream patch to fix CVE-2021-27803

In reply to Sam Voss

Sam, All,

On 2021-06-01 13:09 -0500, Sam Voss via buildroot spake thusly:

Quoted 7 lines

Fixes the following:

- 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.

Usually, when there is a patch to hostpad to fix a CVE, we probably need the same patch against wpa_supplicant, since they both shared the same source tree...

See for example:

    0c65499c3f package/wpa_supplicant: fix build with CVE-2021-30004 changes
    75496165dc package/hostapd: fix build with CVE-2021-30004 changes
    a8fbe67b9b package/wpa_supplicant: add upstream patch to fix CVE-2021-30004
    d65586f45a package/hostapd: add upstream patch to fix CVE-2021-30004
    2f6a6b8e50 package/wpa_supplicant: ignore CVE-2021-30004 when using openssl
    3d3348fd03 package/hostapd: ignore CVE-2021-30004 when using openssl
    650d907c13 package/wpa_supplicant: fix CVE-2019-16275
    749fbab0bb package/hostapd: fix CVE-2019-16275

Could you look at providing a patch to wpa_supplicant for CVE-2021-27803, please?

Regards,
Yann E. MORIN.

Quoted 47 lines
---
 package/hostapd/hostapd.hash | 1 +
 package/hostapd/hostapd.mk   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
package/hostapd/hostapd.hash +1 -0
index e2f76c12d9..9ac5f4b392 100644
@@ -3,4 +3,5 @@ sha256  881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7  hostap
 sha256  2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7  0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 sha256  49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de  0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
 sha256  a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a  0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+sha256  7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611  0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 sha256  9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761  README
package/hostapd/hostapd.mk +5 -1
index 8eff92eb1e..8820254f89 100644
@@ -11,7 +11,8 @@ HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_PATCH = \
 	https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \
 	https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \
-	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \
+	https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 HOSTAPD_DEPENDENCIES = host-pkgconf
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS)
 HOSTAPD_LICENSE = BSD-3-Clause
@@ -26,6 +27,9 @@ HOSTAPD_IGNORE_CVES += CVE-2020-12695
 # 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch
 HOSTAPD_IGNORE_CVES += CVE-2021-30004
 
+# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
+HOSTAPD_IGNORE_CVES += CVE-2021-27803
+
 HOSTAPD_CPE_ID_VENDOR = w1.fi
 HOSTAPD_CONFIG_SET =
 
Signature · 6 lines
2.17.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 package/hostapd: add upstream patch to fix CVE-2021-27803

Quoted 26 lines · Yann E. MORIN

Sam, All,

On 2021-06-01 13:09 -0500, Sam Voss via buildroot spake thusly:

Quoted 7 lines

Fixes the following:

- 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.

Usually, when there is a patch to hostpad to fix a CVE, we probably need the same patch against wpa_supplicant, since they both shared the same source tree...

See for example:

    0c65499c3f package/wpa_supplicant: fix build with CVE-2021-30004 changes
    75496165dc package/hostapd: fix build with CVE-2021-30004 changes
    a8fbe67b9b package/wpa_supplicant: add upstream patch to fix CVE-2021-30004
    d65586f45a package/hostapd: add upstream patch to fix CVE-2021-30004
    2f6a6b8e50 package/wpa_supplicant: ignore CVE-2021-30004 when using openssl
    3d3348fd03 package/hostapd: ignore CVE-2021-30004 when using openssl
    650d907c13 package/wpa_supplicant: fix CVE-2019-16275
    749fbab0bb package/hostapd: fix CVE-2019-16275
Quoted 2 lines

Could you look at providing a patch to wpa_supplicant for CVE-2021-27803, please?

Peter already applied it in 9ada4eb2f1c3d67ee49f6f5466738bcd821fc647, at the
time there was no CVE yet. Fabrice later added the exception for CVE-2021-27803 in 1a7cf592a834357c5777e452f0b7ab7652e7d389.

So Sam, nothing to do :-)

Regards,
Arnout

Quoted 52 lines

Regards,
Yann E. MORIN.

Quoted 47 lines
---
 package/hostapd/hostapd.hash | 1 +
 package/hostapd/hostapd.mk   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
package/hostapd/hostapd.hash +1 -0
index e2f76c12d9..9ac5f4b392 100644
@@ -3,4 +3,5 @@ sha256  881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7  hostap
 sha256  2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7  0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 sha256  49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de  0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
 sha256  a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a  0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+sha256  7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611  0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 sha256  9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761  README
package/hostapd/hostapd.mk +5 -1
index 8eff92eb1e..8820254f89 100644
@@ -11,7 +11,8 @@ HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_PATCH = \
 	https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \
 	https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \
-	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+	https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \
+	https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
 HOSTAPD_DEPENDENCIES = host-pkgconf
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS)
 HOSTAPD_LICENSE = BSD-3-Clause
@@ -26,6 +27,9 @@ HOSTAPD_IGNORE_CVES += CVE-2020-12695
 # 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch
 HOSTAPD_IGNORE_CVES += CVE-2021-30004
 
+# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch
+HOSTAPD_IGNORE_CVES += CVE-2021-27803
+
 HOSTAPD_CPE_ID_VENDOR = w1.fi
 HOSTAPD_CONFIG_SET =
 
Signature · 6 lines
2.17.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
#4 lore raw

PATCH 1/1 package/hostapd: add upstream patch to fix CVE-2021-27803

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Hi,

Quoted 6 lines
Quoted 2 lines

Could you look at providing a patch to wpa_supplicant for CVE-2021-27803, please?

Peter already applied it in 9ada4eb2f1c3d67ee49f6f5466738bcd821fc647, at the
time there was no CVE yet. Fabrice later added the exception for CVE-2021-27803 in 1a7cf592a834357c5777e452f0b7ab7652e7d389.

Indeed. I did not add it to hostapd at the time, as the issue (to my reading at least) is specific to wpa_supplicant.

Why are we adding it to hostapd here? Just for consistency?

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

Hi Peter,

Quoted 11 lines

-----Original Message-----
From: Peter Korsgaard <[email protected]> On Behalf Of Peter Korsgaard
Sent: Sunday, June 06, 2021 2:10 AM
To: Arnout Vandecappelle <[email protected]>
Cc: Yann E. MORIN <[email protected]>; Voss, Samuel M Collins <[email protected]>; Weber, Matthew L Collins <[email protected]>; Sergey Matyukevich <[email protected]>; buildroot at buildroot.org
Subject: [External] Re: [PATCH] package/hostapd: add upstream patch to fix CVE-2021-27803

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Hi,

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Could you look at providing a patch to wpa_supplicant for >> CVE-2021-27803, please?

Peter already applied it in 9ada4eb2f1c3d67ee49f6f5466738bcd821fc647, at the > time there was no CVE yet. Fabrice later added the exception for CVE-2021-27803 > in 1a7cf592a834357c5777e452f0b7ab7652e7d389.

Indeed. I did not add it to hostapd at the time, as the issue (to my reading at least) is specific to wpa_supplicant.

Why are we adding it to hostapd here? Just for consistency?

Ultimately it was added because it was identified as a CVE against this version of the package, and a patch was available for it. It came up during CVE discovery on one of our products so I sent the patch accordingly.

I didn't personally take the onus to establish whether it was exploitable, just that it was reported as vulnerable.

Sam