git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001
   2 From: Jouni Malinen <jouni@codeaurora.org>
   3 Date: Mon, 9 Nov 2020 11:43:12 +0200
   4 Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group
   5  client
   6
   7 Parsing and copying of WPS secondary device types list was verifying
   8 that the contents is not too long for the internal maximum in the case
   9 of WPS messages, but similar validation was missing from the case of P2P
  10 group information which encodes this information in a different
  11 attribute. This could result in writing beyond the memory area assigned
  12 for these entries and corrupting memory within an instance of struct
  13 p2p_device. This could result in invalid operations and unexpected
  14 behavior when trying to free pointers from that corrupted memory.
  15
  16 Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269
  17 Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers")
  18 Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
  19 ---
  20  src/p2p/p2p.c | 2 ++
  21  1 file changed, 2 insertions(+)
  22
  23 --- a/src/p2p/p2p.c
  24 +++ b/src/p2p/p2p.c
  25 @@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct
  26         dev->info.config_methods = cli->config_methods;
  27         os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
  28         dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
  29 +       if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
  30 +               dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
  31         os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
  32                   dev->info.wps_sec_dev_type_list_len);
  33  }