From 030acaa78077aeda01636cbbfb7935fb5ccff829 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 15 Sep 2010 03:14:48 +0000 Subject: hostapd: fix wpa_supplicant crash issues in WDS STA mode git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23067 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/430-supplicant_bridge_fix.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/hostapd/patches/430-supplicant_bridge_fix.patch (limited to 'package/hostapd') diff --git a/package/hostapd/patches/430-supplicant_bridge_fix.patch b/package/hostapd/patches/430-supplicant_bridge_fix.patch new file mode 100644 index 000000000..483c53f9d --- /dev/null +++ b/package/hostapd/patches/430-supplicant_bridge_fix.patch @@ -0,0 +1,43 @@ +--- a/src/drivers/driver_nl80211.c ++++ b/src/drivers/driver_nl80211.c +@@ -410,6 +410,10 @@ static void wpa_driver_nl80211_event_rtm + return; + } + ++ if (ifi->ifi_family == AF_BRIDGE && ++ drv->nlmode != NL80211_IFTYPE_AP) ++ return; ++ + wpa_printf(MSG_DEBUG, "RTM_NEWLINK: operstate=%d ifi_flags=0x%x " + "(%s%s%s%s)", + drv->operstate, ifi->ifi_flags, +@@ -481,6 +485,10 @@ static void wpa_driver_nl80211_event_rtm + attrlen = len; + attr = (struct rtattr *) buf; + ++ if (ifi->ifi_family == AF_BRIDGE && ++ drv->nlmode != NL80211_IFTYPE_AP) ++ return; ++ + rta_len = RTA_ALIGN(sizeof(struct rtattr)); + while (RTA_OK(attr, attrlen)) { + if (attr->rta_type == IFLA_IFNAME) { +@@ -1347,6 +1355,9 @@ static int wpa_driver_nl80211_init_nl(st + eloop_register_read_sock(nl_socket_get_fd(drv->nl_handle_event), + wpa_driver_nl80211_event_receive, drv, ctx); + ++ drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int); ++ drv->if_indices = drv->default_if_indices; ++ + return 0; + + err4: +@@ -4867,8 +4878,6 @@ static void *i802_init(struct hostapd_da + br_ifindex = 0; + } + +- drv->num_if_indices = sizeof(drv->default_if_indices) / sizeof(int); +- drv->if_indices = drv->default_if_indices; + for (i = 0; i < params->num_bridge; i++) { + if (params->bridge[i]) { + ifindex = if_nametoindex(params->bridge[i]); -- cgit v1.2.3