Page MenuHomeFreeBSD
Differential D11031 Diff 29241 contrib/wpa/src/drivers/driver_ndis.c

Changeset View

Standalone View

View Options

contrib/wpa/src/drivers/driver_ndis.c

Context not available.
o->Length = len; o->Length = len;
if (!PacketRequest(drv->adapter, FALSE, o)) { if (!PacketRequest(drv->adapter, FALSE, o)) {
wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed", wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%zu) failed",
emasteUnsubmitted
Done
Inline Actions

The z modifier should be used for size_t (so %zu here)

emaste: The `z` modifier should be used for size_t (so `%zu` here)
__func__, oid, len); __func__, oid, len);
os_free(buf); os_free(buf);
return -1; return -1;
} }
if (o->Length > len) { if (o->Length > len) {
wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%d)", wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%u) > len (%zu)",
__func__, oid, (unsigned int) o->Length, len); __func__, oid, (unsigned int) o->Length, len);
os_free(buf); os_free(buf);
return -1; return -1;
Context not available.
os_memcpy(o->Data, data, len); os_memcpy(o->Data, data, len);
if (!PacketRequest(drv->adapter, TRUE, o)) { if (!PacketRequest(drv->adapter, TRUE, o)) {
wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed", wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%zu) failed",
__func__, oid, len); __func__, oid, len);
os_free(buf); os_free(buf);
return -1; return -1;
Context not available.
if (data_len < sizeof(*req)) { if (data_len < sizeof(*req)) {
wpa_printf(MSG_DEBUG, "NDIS: Too short Authentication Request " wpa_printf(MSG_DEBUG, "NDIS: Too short Authentication Request "
"Event (len=%d)", data_len); "Event (len=%zu)", data_len);
return; return;
} }
req = (NDIS_802_11_AUTHENTICATION_REQUEST *) data; req = (NDIS_802_11_AUTHENTICATION_REQUEST *) data;
Context not available.
if (data_len < 8) { if (data_len < 8) {
wpa_printf(MSG_DEBUG, "NDIS: Too short PMKID Candidate List " wpa_printf(MSG_DEBUG, "NDIS: Too short PMKID Candidate List "
"Event (len=%d)", data_len); "Event (len=%zu)", data_len);
return; return;
} }
pmkid = (NDIS_802_11_PMKID_CANDIDATE_LIST *) data; pmkid = (NDIS_802_11_PMKID_CANDIDATE_LIST *) data;
Context not available.
os_memset(&event, 0, sizeof(event)); os_memset(&event, 0, sizeof(event));
for (i = 0; i < pmkid->NumCandidates; i++) { for (i = 0; i < pmkid->NumCandidates; i++) {
PMKID_CANDIDATE *p = &pmkid->CandidateList[i]; PMKID_CANDIDATE *p = &pmkid->CandidateList[i];
wpa_printf(MSG_DEBUG, "NDIS: %d: " MACSTR " Flags 0x%x", wpa_printf(MSG_DEBUG, "NDIS: %zu: " MACSTR " Flags 0x%x",
i, MAC2STR(p->BSSID), (int) p->Flags); i, MAC2STR(p->BSSID), (int) p->Flags);
os_memcpy(event.pmkid_candidate.bssid, p->BSSID, ETH_ALEN); os_memcpy(event.pmkid_candidate.bssid, p->BSSID, ETH_ALEN);
event.pmkid_candidate.index = i; event.pmkid_candidate.index = i;
Context not available.
"overflow"); "overflow");
break; break;
} }
wpa_printf(MSG_MSGDUMP, "NDIS: %d - auth %d encr %d", wpa_printf(MSG_MSGDUMP, "NDIS: %zu - auth %d encr %d",
i, (int) ae->AuthModeSupported, i, (int) ae->AuthModeSupported,
(int) ae->EncryptStatusSupported); (int) ae->EncryptStatusSupported);
switch (ae->AuthModeSupported) { switch (ae->AuthModeSupported) {
Context not available.
if (_names == NULL) if (_names == NULL)
return -1; return -1;
res = PacketGetAdapterNames(_names, &len); res = PacketGetAdapterNames((int8_t*)_names, &len);
if (!res && len > 8192) { if (!res && len > 8192) {
os_free(_names); os_free(_names);
_names = os_zalloc(len); _names = os_zalloc(len);
if (_names == NULL) if (_names == NULL)
return -1; return -1;
res = PacketGetAdapterNames(_names, &len); res = PacketGetAdapterNames((int8_t*)_names, &len);
} }
if (!res) { if (!res) {
Context not available.
#else /* CONFIG_USE_NDISUIO */ #else /* CONFIG_USE_NDISUIO */
char ifname[128]; char ifname[128];
os_snprintf(ifname, sizeof(ifname), "\\Device\\NPF_%s", drv->ifname); os_snprintf(ifname, sizeof(ifname), "\\Device\\NPF_%s", drv->ifname);
drv->adapter = PacketOpenAdapter(ifname); drv->adapter = PacketOpenAdapter((int8_t*)ifname);
if (drv->adapter == NULL) { if (drv->adapter == NULL) {
wpa_printf(MSG_DEBUG, "NDIS: PacketOpenAdapter failed for " wpa_printf(MSG_DEBUG, "NDIS: PacketOpenAdapter failed for "
"'%s'", ifname); "'%s'", ifname);
Context not available.
if (_names == NULL) if (_names == NULL)
return NULL; return NULL;
res = PacketGetAdapterNames(_names, &len); res = PacketGetAdapterNames((int8_t*)_names, &len);
if (!res && len > 8192) { if (!res && len > 8192) {
os_free(_names); os_free(_names);
_names = os_zalloc(len); _names = os_zalloc(len);
if (_names == NULL) if (_names == NULL)
return NULL; return NULL;
res = PacketGetAdapterNames(_names, &len); res = PacketGetAdapterNames((int8_t*)_names, &len);
} }
if (!res) { if (!res) {
Context not available.