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

   1 From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
   2 From: Jouni Malinen <jouni@qca.qualcomm.com>
   3 Date: Tue, 7 Apr 2015 11:32:11 +0300
   4 Subject: [PATCH] P2P: Validate SSID element length before copying it
   5  (CVE-2015-1863)
   6
   7 This fixes a possible memcpy overflow for P2P dev->oper_ssid in
   8 p2p_add_device(). The length provided by the peer device (0..255 bytes)
   9 was used without proper bounds checking and that could have resulted in
  10 arbitrary data of up to 223 bytes being written beyond the end of the
  11 dev->oper_ssid[] array (of which about 150 bytes would be beyond the
  12 heap allocation) when processing a corrupted management frame for P2P
  13 peer discovery purposes.
  14
  15 This could result in corrupted state in heap, unexpected program
  16 behavior due to corrupted P2P peer device information, denial of service
  17 due to process crash, exposure of memory contents during GO Negotiation,
  18 and potentially arbitrary code execution.
  19
  20 Thanks to Google security team for reporting this issue and smart
  21 hardware research group of Alibaba security team for discovering it.
  22
  23 Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
  24 ---
  25  src/p2p/p2p.c | 1 +
  26  1 file changed, 1 insertion(+)
  27
  28 --- a/src/p2p/p2p.c
  29 +++ b/src/p2p/p2p.c
  30 @@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p,
  31         if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
  32                 os_memcpy(dev->interface_addr, addr, ETH_ALEN);
  33         if (msg.ssid &&
  34 +           msg.ssid[1] <= sizeof(dev->oper_ssid) &&
  35             (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
  36              os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
  37              != 0)) {