diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-04-23 20:10:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-04-23 20:10:48 +0000 |
| commit | 7916ac221059b8aa6385b255b025aa542bc2de4d (patch) | |
| tree | 3c1769adb8ee1e171ffa9c7e568f33767c3e341b | |
| parent | 8347444e0bfb85e4550817fc99903f38ce8f5bcc (diff) | |
| parent | 56509450883285e6384f7e51d97a726456d367a2 (diff) | |
| download | android_external_wpa_supplicant_8-7916ac221059b8aa6385b255b025aa542bc2de4d.tar.gz android_external_wpa_supplicant_8-7916ac221059b8aa6385b255b025aa542bc2de4d.tar.bz2 android_external_wpa_supplicant_8-7916ac221059b8aa6385b255b025aa542bc2de4d.zip | |
am dc5da6ac: am b73408d1: am fdb708a3: P2P: Validate SSID element length before copying it
automerge: 5650945
* commit '56509450883285e6384f7e51d97a726456d367a2':
P2P: Validate SSID element length before copying it
| -rw-r--r-- | src/p2p/p2p.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index f584fae2..a45fe73b 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0) os_memcpy(dev->interface_addr, addr, ETH_ALEN); if (msg.ssid && + msg.ssid[1] <= sizeof(dev->oper_ssid) && (msg.ssid[1] != P2P_WILDCARD_SSID_LEN || os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN) != 0)) { |