DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2PS: Fix service hash matching for org.wi-fi.wfds

Browse source 
This "wildcard" match is for WFA specified org.wi-fi.wfds.* services,
not for all services. Verify that there is a really matching service
being advertised instead of assuming this "wildcard" matches if any
services are advertised.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-06-18 17:11:27 +03:00 • committed by Jouni Malinen
parent 24533f7e81
commit ebdc32f350
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p2p/p2p.c
View file

@ -2226,18 +2226,21 @@ struct wpabuf * p2p_build_probe_resp_ies(struct p2p_data *p2p,
static int p2p_service_find_asp(struct p2p_data *p2p, const u8 *hash) static int p2p_service_find_asp(struct p2p_data *p2p, const u8 *hash)
{ {
struct p2ps_advertisement *adv_data; struct p2ps_advertisement *adv_data;
int any_wfa;
p2p_dbg(p2p, "ASP find - ASP list: %p", p2p->p2ps_adv_list); p2p_dbg(p2p, "ASP find - ASP list: %p", p2p->p2ps_adv_list);
/* Wildcard always matches if we have actual services */ /* Wildcard org.wi-fi.wfds matches any WFA spec defined service */
if (os_memcmp(hash, p2p->wild_card_hash, P2PS_HASH_LEN) == 0) any_wfa = os_memcmp(hash, p2p->wild_card_hash, P2PS_HASH_LEN) == 0;
return p2p->p2ps_adv_list != NULL;
adv_data = p2p->p2ps_adv_list; adv_data = p2p->p2ps_adv_list;
while (adv_data) { while (adv_data) {
p2p_dbg(p2p, "ASP hash: %x =? %x", hash[0], adv_data->hash[0]);
if (os_memcmp(hash, adv_data->hash, P2PS_HASH_LEN) == 0) if (os_memcmp(hash, adv_data->hash, P2PS_HASH_LEN) == 0)
return 1; return 1; /* exact hash match */
if (any_wfa &&
os_strncmp(adv_data->svc_name, P2PS_WILD_HASH_STR,
os_strlen(P2PS_WILD_HASH_STR)) == 0)
return 1; /* WFA service match */
adv_data = adv_data->next; adv_data = adv_data->next;
} }