Author: jow Date: 2014-07-25 17:52:17 +0200 (Fri, 25 Jul 2014) New Revision: 41830
Modified: trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c Log: iwinfo: avoid creating tmp.* ifaces for scanning If the iface to scan on already is in ad-hoc, station or monitor mode then do not spawn a temporary iface. Also preventively disable IPv6 on temporary ifaces before bringing them up to avoid potential security issues. Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c =================================================================== --- trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c 2014-07-25 14:36:43 UTC (rev 41829) +++ trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c 2014-07-25 15:52:17 UTC (rev 41830) @@ -720,9 +720,10 @@ static char * nl80211_ifadd(const char *ifname) { int phyidx; - char *rv = NULL; + char *rv = NULL, path[PATH_MAX]; static char nif[IFNAMSIZ] = { 0 }; struct nl80211_msg_conveyor *req, *res; + FILE *sysfs; req = nl80211_msg(ifname, NL80211_CMD_NEW_INTERFACE, 0); if (req) @@ -734,6 +735,15 @@ nl80211_send(req, NULL, NULL); + snprintf(path, sizeof(path) - 1, + "/proc/sys/net/ipv6/conf/%s/disable_ipv6", nif); + + if ((sysfs = fopen(path, "w")) != NULL) + { + fwrite("0\n", 1, 2, sysfs); + fclose(sysfs); + } + rv = nif; nla_put_failure: @@ -1865,7 +1875,7 @@ static int nl80211_get_scanlist(const char *ifname, char *buf, int *len) { - int freq, rssi, qmax, count; + int freq, rssi, qmax, count, mode; char *res; char ssid[128] = { 0 }; char bssid[18] = { 0 }; @@ -1983,6 +1993,16 @@ } } + /* station / ad-hoc / monitor scan */ + else if (!nl80211_get_mode(ifname, &mode) && + (mode == IWINFO_OPMODE_ADHOC || + mode == IWINFO_OPMODE_CLIENT || + mode == IWINFO_OPMODE_MONITOR) && + iwinfo_ifup(ifname)) + { + return nl80211_get_scanlist_nl(ifname, buf, len); + } + /* AP scan */ else { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
