diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2021-02-06 17:27:31 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2021-02-06 18:03:54 +0100 |
| commit | a4124fa8bc9aff4db0b2ae079e573124f4f3f016 (patch) | |
| tree | 199080045d8eeb4982f8c4316d43b2fef4507e0c | |
| parent | 8daccfa92789139df325d41e2891c14677cc51df (diff) | |
P2P: Fix copying of secondary device types for P2P group client (CVE-2021-0326)
Closes: #981971
| -rw-r--r-- | debian/patches/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch | 39 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/debian/patches/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch new file mode 100644 index 0000000..a0a3414 --- /dev/null +++ b/debian/patches/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch @@ -0,0 +1,39 @@ +From: Jouni Malinen <jouni@codeaurora.org> +Date: Mon, 9 Nov 2020 11:43:12 +0200 +Subject: P2P: Fix copying of secondary device types for P2P group client +Origin: https://w1.fi/cgit/hostap/commit/?id=947272febe24a8f0ea828b5b2f35f13c3821901e +Bug-Debian: https://bugs.debian.org/981971 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2021-0326 + +Parsing and copying of WPS secondary device types list was verifying +that the contents is not too long for the internal maximum in the case +of WPS messages, but similar validation was missing from the case of P2P +group information which encodes this information in a different +attribute. This could result in writing beyond the memory area assigned +for these entries and corrupting memory within an instance of struct +p2p_device. This could result in invalid operations and unexpected +behavior when trying to free pointers from that corrupted memory. + +Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 +Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/p2p/p2p.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c +index 74b7b52ae05c..5cbfc217fc1f 100644 +--- a/src/p2p/p2p.c ++++ b/src/p2p/p2p.c +@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, + dev->info.config_methods = cli->config_methods; + os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); + dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; ++ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) ++ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; + os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, + dev->info.wps_sec_dev_type_list_len); + } +-- +2.30.0 + diff --git a/debian/patches/series b/debian/patches/series index 1dd05a6..6a6d7a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ upstream-fixes/0009-D-Bus-Increase-introspection-buffer-size.patch upstream-fixes/0010-P2P-Limit-P2P_DEVICE-name-to-appropriate-ifname-size.patch proposed-fixes/hostapd-does-not-update-WPS-credentials-on-SIGHUP.patch proposed-fixes/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 |