jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix copy-paste bug in p2p_serv_disc_resp handling

Browse source 
The destination address for p2p_serv_disc_resp must always be set
to an individual MAC address unlike p2p_serv_disc_req which may use
00:00:00:00:00:00 to indicate wildcard query. As such, we should not
try to check for this special case here.
This commit is contained in:
Jouni Malinen 2010-10-31 12:17:30 +02:00
parent d394a22f30
commit d25f7212da
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wpa_supplicant/ctrl_iface.c
View file

@ -2116,7 +2116,7 @@ static int p2p_ctrl_serv_disc_cancel_req(struct wpa_supplicant *wpa_s,
static int p2p_ctrl_serv_disc_resp(struct wpa_supplicant *wpa_s, char *cmd) static int p2p_ctrl_serv_disc_resp(struct wpa_supplicant *wpa_s, char *cmd)
{ {
int freq; int freq;
u8 dst_buf[ETH_ALEN], *dst; u8 dst[ETH_ALEN];
u8 dialog_token; u8 dialog_token;
struct wpabuf *resp_tlvs; struct wpabuf *resp_tlvs;
char *pos, *pos2; char *pos, *pos2;
@ -2130,12 +2130,8 @@ static int p2p_ctrl_serv_disc_resp(struct wpa_supplicant *wpa_s, char *cmd)
if (freq == 0) if (freq == 0)
return -1; return -1;
if (hwaddr_aton(pos, dst_buf)) if (hwaddr_aton(pos, dst))
return -1; return -1;
dst = dst_buf;
if (dst[0] == 0 && dst[1] == 0 && dst[2] == 0 &&
dst[3] == 0 && dst[4] == 0 && dst[5] == 0)
dst = NULL;
pos += 17; pos += 17;
if (*pos != ' ') if (*pos != ' ')
return -1; return -1;