Skip to content

Commit

Permalink
batman-adv: Correct rcu refcounting for batman_if
Browse files Browse the repository at this point in the history 
It might be possible that 2 threads access the same data in the same
rcu grace period. The first thread calls call_rcu() to decrement the
refcount and free the data while the second thread increases the
refcount to use the data. To avoid this race condition all refcount
operations have to be atomic.

Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  • Loading branch information
Marek Lindner committed Mar 5, 2011
1 parent 7d2b554 commit ed75ccb
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 38 deletions.
20 changes: 9 additions & 11 deletions net/batman-adv/bat_sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr,
length = sprintf(buff, "%s\n", batman_if->if_status == IF_NOT_IN_USE ?
"none" : batman_if->soft_iface->name);

kref_put(&batman_if->refcount, hardif_free_ref);
hardif_free_ref(batman_if);

return length;
}
Expand All @@ -461,7 +461,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
struct net_device *net_dev = kobj_to_netdev(kobj);
struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
int status_tmp = -1;
int ret;
int ret = count;

if (!batman_if)
return count;
Expand All @@ -472,7 +472,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
if (strlen(buff) >= IFNAMSIZ) {
pr_err("Invalid parameter for 'mesh_iface' setting received: "
"interface name too long '%s'\n", buff);
kref_put(&batman_if->refcount, hardif_free_ref);
hardif_free_ref(batman_if);
return -EINVAL;
}

Expand All @@ -482,17 +482,14 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
status_tmp = IF_I_WANT_YOU;

if ((batman_if->if_status == status_tmp) || ((batman_if->soft_iface) &&
(strncmp(batman_if->soft_iface->name, buff, IFNAMSIZ) == 0))) {
kref_put(&batman_if->refcount, hardif_free_ref);
return count;
}
(strncmp(batman_if->soft_iface->name, buff, IFNAMSIZ) == 0)))
goto out;

if (status_tmp == IF_NOT_IN_USE) {
rtnl_lock();
hardif_disable_interface(batman_if);
rtnl_unlock();
kref_put(&batman_if->refcount, hardif_free_ref);
return count;
goto out;
}

/* if the interface already is in use */
Expand All @@ -503,8 +500,9 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
}

ret = hardif_enable_interface(batman_if, buff);
kref_put(&batman_if->refcount, hardif_free_ref);

out:
hardif_free_ref(batman_if);
return ret;
}

Expand Down Expand Up @@ -537,7 +535,7 @@ static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr,
break;
}

kref_put(&batman_if->refcount, hardif_free_ref);
hardif_free_ref(batman_if);

return length;
}
Expand Down
40 changes: 19 additions & 21 deletions net/batman-adv/hard-interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ static int batman_skb_recv(struct sk_buff *skb,
struct packet_type *ptype,
struct net_device *orig_dev);

static void hardif_free_rcu(struct rcu_head *rcu)
void hardif_free_rcu(struct rcu_head *rcu)
{
struct batman_if *batman_if;

batman_if = container_of(rcu, struct batman_if, rcu);
dev_put(batman_if->net_dev);
kref_put(&batman_if->refcount, hardif_free_ref);
kfree(batman_if);
}

struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev)
Expand All @@ -55,16 +55,14 @@ struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev)

rcu_read_lock();
list_for_each_entry_rcu(batman_if, &if_list, list) {
if (batman_if->net_dev == net_dev)
if (batman_if->net_dev == net_dev &&
atomic_inc_not_zero(&batman_if->refcount))
goto out;
}

batman_if = NULL;

out:
if (batman_if)
kref_get(&batman_if->refcount);

rcu_read_unlock();
return batman_if;
}
Expand Down Expand Up @@ -105,16 +103,14 @@ static struct batman_if *get_active_batman_if(struct net_device *soft_iface)
if (batman_if->soft_iface != soft_iface)
continue;

if (batman_if->if_status == IF_ACTIVE)
if (batman_if->if_status == IF_ACTIVE &&
atomic_inc_not_zero(&batman_if->refcount))
goto out;
}

batman_if = NULL;

out:
if (batman_if)
kref_get(&batman_if->refcount);

rcu_read_unlock();
return batman_if;
}
Expand All @@ -137,14 +133,14 @@ static void set_primary_if(struct bat_priv *bat_priv,
struct batman_packet *batman_packet;
struct batman_if *old_if;

if (batman_if)
kref_get(&batman_if->refcount);
if (batman_if && !atomic_inc_not_zero(&batman_if->refcount))
batman_if = NULL;

old_if = bat_priv->primary_if;
bat_priv->primary_if = batman_if;

if (old_if)
kref_put(&old_if->refcount, hardif_free_ref);
hardif_free_ref(old_if);

if (!bat_priv->primary_if)
return;
Expand Down Expand Up @@ -290,6 +286,9 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
if (batman_if->if_status != IF_NOT_IN_USE)
goto out;

if (!atomic_inc_not_zero(&batman_if->refcount))
goto out;

batman_if->soft_iface = dev_get_by_name(&init_net, iface_name);

if (!batman_if->soft_iface) {
Expand Down Expand Up @@ -328,7 +327,6 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
batman_if->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN);
batman_if->batman_adv_ptype.func = batman_skb_recv;
batman_if->batman_adv_ptype.dev = batman_if->net_dev;
kref_get(&batman_if->refcount);
dev_add_pack(&batman_if->batman_adv_ptype);

atomic_set(&batman_if->seqno, 1);
Expand Down Expand Up @@ -371,6 +369,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
return 0;

err:
hardif_free_ref(batman_if);
return -ENOMEM;
}

Expand All @@ -387,7 +386,6 @@ void hardif_disable_interface(struct batman_if *batman_if)
bat_info(batman_if->soft_iface, "Removing interface: %s\n",
batman_if->net_dev->name);
dev_remove_pack(&batman_if->batman_adv_ptype);
kref_put(&batman_if->refcount, hardif_free_ref);

bat_priv->num_ifaces--;
orig_hash_del_if(batman_if, bat_priv->num_ifaces);
Expand All @@ -399,7 +397,7 @@ void hardif_disable_interface(struct batman_if *batman_if)
set_primary_if(bat_priv, new_if);

if (new_if)
kref_put(&new_if->refcount, hardif_free_ref);
hardif_free_ref(new_if);
}

kfree(batman_if->packet_buff);
Expand All @@ -416,6 +414,7 @@ void hardif_disable_interface(struct batman_if *batman_if)
softif_destroy(batman_if->soft_iface);

batman_if->soft_iface = NULL;
hardif_free_ref(batman_if);
}

static struct batman_if *hardif_add_interface(struct net_device *net_dev)
Expand Down Expand Up @@ -445,16 +444,15 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev)
batman_if->soft_iface = NULL;
batman_if->if_status = IF_NOT_IN_USE;
INIT_LIST_HEAD(&batman_if->list);
kref_init(&batman_if->refcount);
/* extra reference for return */
atomic_set(&batman_if->refcount, 2);

check_known_mac_addr(batman_if->net_dev);

spin_lock(&if_list_lock);
list_add_tail_rcu(&batman_if->list, &if_list);
spin_unlock(&if_list_lock);

/* extra reference for return */
kref_get(&batman_if->refcount);
return batman_if;

free_if:
Expand All @@ -476,7 +474,7 @@ static void hardif_remove_interface(struct batman_if *batman_if)

batman_if->if_status = IF_TO_BE_REMOVED;
sysfs_del_hardif(&batman_if->hardif_obj);
call_rcu(&batman_if->rcu, hardif_free_rcu);
hardif_free_ref(batman_if);
}

void hardif_remove_interfaces(void)
Expand Down Expand Up @@ -548,7 +546,7 @@ static int hard_if_event(struct notifier_block *this,
};

hardif_put:
kref_put(&batman_if->refcount, hardif_free_ref);
hardif_free_ref(batman_if);
out:
return NOTIFY_DONE;
}
Expand Down
9 changes: 4 additions & 5 deletions net/batman-adv/hard-interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ void hardif_disable_interface(struct batman_if *batman_if);
void hardif_remove_interfaces(void);
int hardif_min_mtu(struct net_device *soft_iface);
void update_min_mtu(struct net_device *soft_iface);
void hardif_free_rcu(struct rcu_head *rcu);

static inline void hardif_free_ref(struct kref *refcount)
static inline void hardif_free_ref(struct batman_if *batman_if)
{
struct batman_if *batman_if;

batman_if = container_of(refcount, struct batman_if, refcount);
kfree(batman_if);
if (atomic_dec_and_test(&batman_if->refcount))
call_rcu(&batman_if->rcu, hardif_free_rcu);
}

#endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */
2 changes: 1 addition & 1 deletion net/batman-adv/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct batman_if {
unsigned char *packet_buff;
int packet_len;
struct kobject *hardif_obj;
struct kref refcount;
atomic_t refcount;
struct packet_type batman_adv_ptype;
struct net_device *soft_iface;
struct rcu_head rcu;
Expand Down

0 comments on commit ed75ccb

Please sign in to comment.