Skip to content

Commit ccb7276

Browse files
andrewstrohmansimonwunderlich
authored andcommitted
batman-adv: fix panic during interface removal
Reference counting is used to ensure that batadv_hardif_neigh_node and batadv_hard_iface are not freed before/during batadv_v_elp_throughput_metric_update work is finished. But there isn't a guarantee that the hard if will remain associated with a soft interface up until the work is finished. This fixes a crash triggered by reboot that looks like this: Call trace: batadv_v_mesh_free+0xd0/0x4dc [batman_adv] batadv_v_elp_throughput_metric_update+0x1c/0xa4 process_one_work+0x178/0x398 worker_thread+0x2e8/0x4d0 kthread+0xd8/0xdc ret_from_fork+0x10/0x20 (the batadv_v_mesh_free call is misleading, and does not actually happen) I was able to make the issue happen more reliably by changing hardif_neigh->bat_v.metric_work work to be delayed work. This allowed me to track down and confirm the fix. Cc: stable@vger.kernel.org Fixes: c833484 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Andy Strohman <andrew@andrewstrohman.com> [sven@narfation.org: prevent entering batadv_v_elp_get_throughput without soft_iface] Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
1 parent fff8f17 commit ccb7276

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

net/batman-adv/bat_v_elp.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,19 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface)
6666
static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
6767
{
6868
struct batadv_hard_iface *hard_iface = neigh->if_incoming;
69+
struct net_device *soft_iface = hard_iface->soft_iface;
6970
struct ethtool_link_ksettings link_settings;
7071
struct net_device *real_netdev;
7172
struct station_info sinfo;
7273
u32 throughput;
7374
int ret;
7475

76+
/* don't query throughput when no longer associated with any
77+
* batman-adv interface
78+
*/
79+
if (!soft_iface)
80+
return BATADV_THROUGHPUT_DEFAULT_VALUE;
81+
7582
/* if the user specified a customised value for this interface, then
7683
* return it directly
7784
*/
@@ -141,7 +148,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
141148

142149
default_throughput:
143150
if (!(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT)) {
144-
batadv_info(hard_iface->soft_iface,
151+
batadv_info(soft_iface,
145152
"WiFi driver or ethtool info does not provide information about link speeds on interface %s, therefore defaulting to hardcoded throughput values of %u.%1u Mbps. Consider overriding the throughput manually or checking your driver.\n",
146153
hard_iface->net_dev->name,
147154
BATADV_THROUGHPUT_DEFAULT_VALUE / 10,

0 commit comments

Comments
 (0)