Module Name: src
Committed By: martin
Date: Mon Feb 16 08:25:31 UTC 2015
Modified Files:
src/external/bsd/wpa/dist/src/drivers [netbsd-6]: driver_bsd.c
Log Message:
Pull up following revision(s) (requested by khorben in ticket #1255):
external/bsd/wpa/dist/src/drivers/driver_bsd.c: revision 1.8
external/bsd/wpa/dist/src/drivers/driver_bsd.c: revision 1.9
CID 272959: NULL deref
Pass the scan result RSSI to the WPA code in a way that it understands.
To generate a diff of this commit:
cvs rdiff -u -r1.4.8.1 -r1.4.8.2 \
src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4.8.1 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4.8.2
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4.8.1 Sat May 19 15:32:37 2012
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c Mon Feb 16 08:25:31 2015
@@ -828,12 +828,13 @@ bsd_init(struct hostapd_data *hapd, stru
return drv;
bad:
- if (drv->sock_xmit != NULL)
- l2_packet_deinit(drv->sock_xmit);
- if (drv->sock >= 0)
- close(drv->sock);
- if (drv != NULL)
+ if (drv != NULL) {
+ if (drv->sock_xmit != NULL)
+ l2_packet_deinit(drv->sock_xmit);
+ if (drv->sock >= 0)
+ close(drv->sock);
os_free(drv);
+ }
return NULL;
}
@@ -1331,7 +1332,7 @@ wpa_driver_bsd_add_scan_entry(struct wpa
result->freq = sr->isr_freq;
result->beacon_int = sr->isr_intval;
result->caps = sr->isr_capinfo;
- result->qual = sr->isr_rssi;
+ result->level = sr->isr_rssi;
result->noise = sr->isr_noise;
pos = (u8 *)(result + 1);
