diff options
| author | Sven Eckelmann <sven@narfation.org> | 2016-03-05 16:09:23 +0100 |
|---|---|---|
| committer | Antonio Quartulli <a@unstable.cc> | 2016-05-10 12:28:29 +0200 |
| commit | c3ba37a778ecab4f8ddb117a2ceff3e13184a7db (patch) | |
| tree | 6fdca2a748684e550135bbe736ab3fbbb1d0e099 /net/batman-adv | |
| parent | batman-adv: Use kref_get for batadv_gw_select (diff) | |
| download | linux-c3ba37a778ecab4f8ddb117a2ceff3e13184a7db.tar.xz linux-c3ba37a778ecab4f8ddb117a2ceff3e13184a7db.zip | |
batman-adv: Use kref_get for batadv_gw_node_add
batadv_gw_node_add requires that the caller already has a valid reference
for orig_node. It is therefore not possible that it has an reference
counter of 0 and was still given to this function
The kref_get function instead WARNs (with debug information) when the
reference counter would still be 0. This makes a bug in batman-adv better
visible because kref_get_unless_zero would have ignored this problem.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/gateway_client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index bb1c4f37716e..5839c569f769 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -440,15 +440,11 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, if (gateway->bandwidth_down == 0) return; - if (!kref_get_unless_zero(&orig_node->refcount)) - return; - gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC); - if (!gw_node) { - batadv_orig_node_put(orig_node); + if (!gw_node) return; - } + kref_get(&orig_node->refcount); INIT_HLIST_NODE(&gw_node->list); gw_node->orig_node = orig_node; gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); |