Skip to content

L
linux
Commit 79a0bffb authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files
Options

batman-adv: Drop NULL check before dropping references 

The check if a batman-adv related object is NULL or not is now directly in
the batadv_*_put functions. It is not needed anymore to perform this check
outside these function:

The changes were generated using a coccinelle semantic patch:

  @@
  expression E;
  @@
  - if (likely(E != NULL))
  (
  batadv_backbone_gw_put
  |
  batadv_claim_put
  |
  batadv_dat_entry_put
  |
  batadv_gw_node_put
  |
  batadv_hardif_neigh_put
  |
  batadv_hardif_put
  |
  batadv_nc_node_put
  |
  batadv_nc_path_put
  |
  batadv_neigh_ifinfo_put
  |
  batadv_neigh_node_put
  |
  batadv_orig_ifinfo_put
  |
  batadv_orig_node_put
  |
  batadv_orig_node_vlan_put
  |
  batadv_softif_vlan_put
  |
  batadv_tp_vars_put
  |
  batadv_tt_global_entry_put
  |
  batadv_tt_local_entry_put
  |
  batadv_tt_orig_list_entry_put
  |
  batadv_tt_req_node_put
  |
  batadv_tvlv_container_put
  |
  batadv_tvlv_handler_put
  )(E);
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 6340dcbd
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 337 deletions
net/batman-adv/bat_iv_ogm.c
View file @ 79a0bffb
...@@ -519,8 +519,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, ...@@ -519,8 +519,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
} }
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
return res; return res;
} }
...@@ -857,8 +856,7 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface) ...@@ -857,8 +856,7 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface)
rcu_read_unlock(); rcu_read_unlock();
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
...@@ -1046,14 +1044,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, ...@@ -1046,14 +1044,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
unlock: unlock:
rcu_read_unlock(); rcu_read_unlock();
out: out:
if (neigh_node) batadv_neigh_node_put(neigh_node);
batadv_neigh_node_put(neigh_node); batadv_neigh_node_put(router);
if (router) batadv_neigh_ifinfo_put(neigh_ifinfo);
batadv_neigh_node_put(router); batadv_neigh_ifinfo_put(router_ifinfo);
if (neigh_ifinfo)
batadv_neigh_ifinfo_put(neigh_ifinfo);
if (router_ifinfo)
batadv_neigh_ifinfo_put(router_ifinfo);
} }
/** /**
...@@ -1194,8 +1188,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, ...@@ -1194,8 +1188,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
ret = true; ret = true;
out: out:
if (neigh_node) batadv_neigh_node_put(neigh_node);
batadv_neigh_node_put(neigh_node);
return ret; return ret;
} }
...@@ -1496,16 +1489,11 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, ...@@ -1496,16 +1489,11 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
if (orig_neigh_node && !is_single_hop_neigh) if (orig_neigh_node && !is_single_hop_neigh)
batadv_orig_node_put(orig_neigh_node); batadv_orig_node_put(orig_neigh_node);
out: out:
if (router_ifinfo) batadv_neigh_ifinfo_put(router_ifinfo);
batadv_neigh_ifinfo_put(router_ifinfo); batadv_neigh_node_put(router);
if (router) batadv_neigh_node_put(router_router);
batadv_neigh_node_put(router); batadv_neigh_node_put(orig_neigh_router);
if (router_router) batadv_hardif_neigh_put(hardif_neigh);
batadv_neigh_node_put(router_router);
if (orig_neigh_router)
batadv_neigh_node_put(orig_neigh_router);
if (hardif_neigh)
batadv_hardif_neigh_put(hardif_neigh);
consume_skb(skb_priv); consume_skb(skb_priv);
} }
...@@ -1926,8 +1914,7 @@ batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, ...@@ -1926,8 +1914,7 @@ batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
} }
out: out:
if (neigh_node_best) batadv_neigh_node_put(neigh_node_best);
batadv_neigh_node_put(neigh_node_best);
*sub_s = 0; *sub_s = 0;
return 0; return 0;
...@@ -2049,10 +2036,8 @@ static bool batadv_iv_ogm_neigh_diff(struct batadv_neigh_node *neigh1, ...@@ -2049,10 +2036,8 @@ static bool batadv_iv_ogm_neigh_diff(struct batadv_neigh_node *neigh1,
*diff = (int)tq1 - (int)tq2; *diff = (int)tq1 - (int)tq2;
out: out:
if (neigh1_ifinfo) batadv_neigh_ifinfo_put(neigh1_ifinfo);
batadv_neigh_ifinfo_put(neigh1_ifinfo); batadv_neigh_ifinfo_put(neigh2_ifinfo);
if (neigh2_ifinfo)
batadv_neigh_ifinfo_put(neigh2_ifinfo);
return ret; return ret;
} }
...@@ -2299,8 +2284,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) ...@@ -2299,8 +2284,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
if (tmp_gw_factor > max_gw_factor || if (tmp_gw_factor > max_gw_factor ||
(tmp_gw_factor == max_gw_factor && (tmp_gw_factor == max_gw_factor &&
tq_avg > max_tq)) { tq_avg > max_tq)) {
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw);
curr_gw = gw_node; curr_gw = gw_node;
kref_get(&curr_gw->refcount); kref_get(&curr_gw->refcount);
} }
...@@ -2314,8 +2298,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) ...@@ -2314,8 +2298,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
* $routing_class more tq points) * $routing_class more tq points)
*/ */
if (tq_avg > max_tq) { if (tq_avg > max_tq) {
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw);
curr_gw = gw_node; curr_gw = gw_node;
kref_get(&curr_gw->refcount); kref_get(&curr_gw->refcount);
} }
...@@ -2332,8 +2315,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) ...@@ -2332,8 +2315,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
next: next:
batadv_neigh_node_put(router); batadv_neigh_node_put(router);
if (router_ifinfo) batadv_neigh_ifinfo_put(router_ifinfo);
batadv_neigh_ifinfo_put(router_ifinfo);
} }
rcu_read_unlock(); rcu_read_unlock();
...@@ -2397,14 +2379,10 @@ static bool batadv_iv_gw_is_eligible(struct batadv_priv *bat_priv, ...@@ -2397,14 +2379,10 @@ static bool batadv_iv_gw_is_eligible(struct batadv_priv *bat_priv,
ret = true; ret = true;
out: out:
if (router_gw_ifinfo) batadv_neigh_ifinfo_put(router_gw_ifinfo);
batadv_neigh_ifinfo_put(router_gw_ifinfo); batadv_neigh_ifinfo_put(router_orig_ifinfo);
if (router_orig_ifinfo) batadv_neigh_node_put(router_gw);
batadv_neigh_ifinfo_put(router_orig_ifinfo); batadv_neigh_node_put(router_orig);
if (router_gw)
batadv_neigh_node_put(router_gw);
if (router_orig)
batadv_neigh_node_put(router_orig);
return ret; return ret;
} }
...@@ -2479,12 +2457,9 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, ...@@ -2479,12 +2457,9 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid,
ret = 0; ret = 0;
out: out:
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw); batadv_neigh_ifinfo_put(router_ifinfo);
if (router_ifinfo) batadv_neigh_node_put(router);
batadv_neigh_ifinfo_put(router_ifinfo);
if (router)
batadv_neigh_node_put(router);
return ret; return ret;
} }
......
net/batman-adv/bat_v.c
View file @ 79a0bffb
...@@ -106,8 +106,7 @@ static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface) ...@@ -106,8 +106,7 @@ static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)
batadv_v_primary_iface_set(hard_iface); batadv_v_primary_iface_set(hard_iface);
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
static void static void
...@@ -366,8 +365,7 @@ batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, ...@@ -366,8 +365,7 @@ batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
} }
out: out:
if (neigh_node_best) batadv_neigh_node_put(neigh_node_best);
batadv_neigh_node_put(neigh_node_best);
*sub_s = 0; *sub_s = 0;
return 0; return 0;
...@@ -568,10 +566,8 @@ static int batadv_v_gw_throughput_get(struct batadv_gw_node *gw_node, u32 *bw) ...@@ -568,10 +566,8 @@ static int batadv_v_gw_throughput_get(struct batadv_gw_node *gw_node, u32 *bw)
ret = 0; ret = 0;
out: out:
if (router) batadv_neigh_node_put(router);
batadv_neigh_node_put(router); batadv_neigh_ifinfo_put(router_ifinfo);
if (router_ifinfo)
batadv_neigh_ifinfo_put(router_ifinfo);
return ret; return ret;
} }
...@@ -599,8 +595,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv) ...@@ -599,8 +595,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv)
if (curr_gw && bw <= max_bw) if (curr_gw && bw <= max_bw)
goto next; goto next;
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw);
curr_gw = gw_node; curr_gw = gw_node;
kref_get(&curr_gw->refcount); kref_get(&curr_gw->refcount);
...@@ -662,10 +657,8 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv, ...@@ -662,10 +657,8 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv,
ret = true; ret = true;
out: out:
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw); batadv_gw_node_put(orig_gw);
if (orig_gw)
batadv_gw_node_put(orig_gw);
return ret; return ret;
} }
...@@ -764,12 +757,9 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, ...@@ -764,12 +757,9 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid,
ret = 0; ret = 0;
out: out:
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw); batadv_neigh_ifinfo_put(router_ifinfo);
if (router_ifinfo) batadv_neigh_node_put(router);
batadv_neigh_ifinfo_put(router_ifinfo);
if (router)
batadv_neigh_node_put(router);
return ret; return ret;
} }
......
net/batman-adv/bat_v_elp.c
View file @ 79a0bffb
...@@ -486,14 +486,11 @@ static void batadv_v_elp_neigh_update(struct batadv_priv *bat_priv, ...@@ -486,14 +486,11 @@ static void batadv_v_elp_neigh_update(struct batadv_priv *bat_priv,
hardif_neigh->bat_v.elp_interval = ntohl(elp_packet->elp_interval); hardif_neigh->bat_v.elp_interval = ntohl(elp_packet->elp_interval);
hardif_free: hardif_free:
if (hardif_neigh) batadv_hardif_neigh_put(hardif_neigh);
batadv_hardif_neigh_put(hardif_neigh);
neigh_free: neigh_free:
if (neigh) batadv_neigh_node_put(neigh);
batadv_neigh_node_put(neigh);
orig_free: orig_free:
if (orig_neigh) batadv_orig_node_put(orig_neigh);
batadv_orig_node_put(orig_neigh);
} }
/** /**
......
net/batman-adv/bat_v_ogm.c
View file @ 79a0bffb
...@@ -584,12 +584,9 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, ...@@ -584,12 +584,9 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv,
batadv_v_ogm_queue_on_if(skb, if_outgoing); batadv_v_ogm_queue_on_if(skb, if_outgoing);
out: out:
if (orig_ifinfo) batadv_orig_ifinfo_put(orig_ifinfo);
batadv_orig_ifinfo_put(orig_ifinfo); batadv_neigh_node_put(router);
if (router) batadv_neigh_ifinfo_put(neigh_ifinfo);
batadv_neigh_node_put(router);
if (neigh_ifinfo)
batadv_neigh_ifinfo_put(neigh_ifinfo);
} }
/** /**
...@@ -669,10 +666,8 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv, ...@@ -669,10 +666,8 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv,
else else
ret = 0; ret = 0;
out: out:
if (orig_ifinfo) batadv_orig_ifinfo_put(orig_ifinfo);
batadv_orig_ifinfo_put(orig_ifinfo); batadv_neigh_ifinfo_put(neigh_ifinfo);
if (neigh_ifinfo)
batadv_neigh_ifinfo_put(neigh_ifinfo);
return ret; return ret;
} }
...@@ -763,16 +758,11 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv, ...@@ -763,16 +758,11 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv,
batadv_update_route(bat_priv, orig_node, if_outgoing, neigh_node); batadv_update_route(bat_priv, orig_node, if_outgoing, neigh_node);
out: out:
if (router) batadv_neigh_node_put(router);
batadv_neigh_node_put(router); batadv_neigh_node_put(orig_neigh_router);
if (orig_neigh_router) batadv_orig_node_put(orig_neigh_node);
batadv_neigh_node_put(orig_neigh_router); batadv_neigh_ifinfo_put(router_ifinfo);
if (orig_neigh_node) batadv_neigh_ifinfo_put(neigh_ifinfo);
batadv_orig_node_put(orig_neigh_node);
if (router_ifinfo)
batadv_neigh_ifinfo_put(router_ifinfo);
if (neigh_ifinfo)
batadv_neigh_ifinfo_put(neigh_ifinfo);
return forward; return forward;
} }
...@@ -978,12 +968,9 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset, ...@@ -978,12 +968,9 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,
} }
rcu_read_unlock(); rcu_read_unlock();
out: out:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node); batadv_neigh_node_put(neigh_node);
if (neigh_node) batadv_hardif_neigh_put(hardif_neigh);
batadv_neigh_node_put(neigh_node);
if (hardif_neigh)
batadv_hardif_neigh_put(hardif_neigh);
} }
/** /**
......
net/batman-adv/bridge_loop_avoidance.c
View file @ 79a0bffb
...@@ -445,8 +445,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, ...@@ -445,8 +445,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
netif_rx_any_context(skb); netif_rx_any_context(skb);
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
/** /**
...@@ -1504,8 +1503,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) ...@@ -1504,8 +1503,7 @@ static void batadv_bla_periodic_work(struct work_struct *work)
rcu_read_unlock(); rcu_read_unlock();
} }
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work, queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,
msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH)); msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
...@@ -1814,8 +1812,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv) ...@@ -1814,8 +1812,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv)
batadv_hash_destroy(bat_priv->bla.backbone_hash); batadv_hash_destroy(bat_priv->bla.backbone_hash);
bat_priv->bla.backbone_hash = NULL; bat_priv->bla.backbone_hash = NULL;
} }
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
/** /**
...@@ -2002,10 +1999,8 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, ...@@ -2002,10 +1999,8 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
ret = true; ret = true;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_claim_put(claim);
if (claim)
batadv_claim_put(claim);
return ret; return ret;
} }
...@@ -2109,10 +2104,8 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, ...@@ -2109,10 +2104,8 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
handled: handled:
ret = true; ret = true;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_claim_put(claim);
if (claim)
batadv_claim_put(claim);
return ret; return ret;
} }
...@@ -2277,8 +2270,7 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -2277,8 +2270,7 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
...@@ -2448,8 +2440,7 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -2448,8 +2440,7 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
......
net/batman-adv/distributed-arp-table.c
View file @ 79a0bffb
...@@ -408,8 +408,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, ...@@ -408,8 +408,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,
&dat_entry->ip, dat_entry->mac_addr, batadv_print_vid(vid)); &dat_entry->ip, dat_entry->mac_addr, batadv_print_vid(vid));
out: out:
if (dat_entry) batadv_dat_entry_put(dat_entry);
batadv_dat_entry_put(dat_entry);
} }
#ifdef CONFIG_BATMAN_ADV_DEBUG #ifdef CONFIG_BATMAN_ADV_DEBUG
...@@ -597,8 +596,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, ...@@ -597,8 +596,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv,
continue; continue;
max = tmp_max; max = tmp_max;
if (max_orig_node) batadv_orig_node_put(max_orig_node);
batadv_orig_node_put(max_orig_node);
max_orig_node = orig_node; max_orig_node = orig_node;
} }
rcu_read_unlock(); rcu_read_unlock();
...@@ -984,8 +982,7 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -984,8 +982,7 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
...@@ -1220,8 +1217,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, ...@@ -1220,8 +1217,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
BATADV_P_DAT_DHT_GET); BATADV_P_DAT_DHT_GET);
} }
out: out:
if (dat_entry) batadv_dat_entry_put(dat_entry);
batadv_dat_entry_put(dat_entry);
return ret; return ret;
} }
...@@ -1288,8 +1284,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, ...@@ -1288,8 +1284,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
ret = true; ret = true;
} }
out: out:
if (dat_entry) batadv_dat_entry_put(dat_entry);
batadv_dat_entry_put(dat_entry);
if (ret) if (ret)
kfree_skb(skb); kfree_skb(skb);
return ret; return ret;
...@@ -1422,8 +1417,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, ...@@ -1422,8 +1417,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
out: out:
if (dropped) if (dropped)
kfree_skb(skb); kfree_skb(skb);
if (dat_entry) batadv_dat_entry_put(dat_entry);
batadv_dat_entry_put(dat_entry);
/* if dropped == false -> deliver to the interface */ /* if dropped == false -> deliver to the interface */
return dropped; return dropped;
} }
...@@ -1832,7 +1826,6 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv, ...@@ -1832,7 +1826,6 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,
ret = true; ret = true;
out: out:
if (dat_entry) batadv_dat_entry_put(dat_entry);
batadv_dat_entry_put(dat_entry);
return ret; return ret;
} }
net/batman-adv/fragmentation.c
View file @ 79a0bffb
...@@ -381,10 +381,8 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, ...@@ -381,10 +381,8 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,
} }
out: out:
if (orig_node_dst) batadv_orig_node_put(orig_node_dst);
batadv_orig_node_put(orig_node_dst); batadv_neigh_node_put(neigh_node);
if (neigh_node)
batadv_neigh_node_put(neigh_node);
return ret; return ret;
} }
......
net/batman-adv/gateway_client.c
View file @ 79a0bffb
...@@ -120,8 +120,7 @@ batadv_gw_get_selected_orig(struct batadv_priv *bat_priv) ...@@ -120,8 +120,7 @@ batadv_gw_get_selected_orig(struct batadv_priv *bat_priv)
unlock: unlock:
rcu_read_unlock(); rcu_read_unlock();
out: out:
if (gw_node) batadv_gw_node_put(gw_node);
batadv_gw_node_put(gw_node);
return orig_node; return orig_node;
} }
...@@ -138,8 +137,7 @@ static void batadv_gw_select(struct batadv_priv *bat_priv, ...@@ -138,8 +137,7 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,
curr_gw_node = rcu_replace_pointer(bat_priv->gw.curr_gw, new_gw_node, curr_gw_node = rcu_replace_pointer(bat_priv->gw.curr_gw, new_gw_node,
true); true);
if (curr_gw_node) batadv_gw_node_put(curr_gw_node);
batadv_gw_node_put(curr_gw_node);
spin_unlock_bh(&bat_priv->gw.list_lock); spin_unlock_bh(&bat_priv->gw.list_lock);
} }
...@@ -274,14 +272,10 @@ void batadv_gw_election(struct batadv_priv *bat_priv) ...@@ -274,14 +272,10 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
batadv_gw_select(bat_priv, next_gw); batadv_gw_select(bat_priv, next_gw);
out: out:
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw); batadv_gw_node_put(next_gw);
if (next_gw) batadv_neigh_node_put(router);
batadv_gw_node_put(next_gw); batadv_neigh_ifinfo_put(router_ifinfo);
if (router)
batadv_neigh_node_put(router);
if (router_ifinfo)
batadv_neigh_ifinfo_put(router_ifinfo);
} }
/** /**
...@@ -315,8 +309,7 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, ...@@ -315,8 +309,7 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,
reselect: reselect:
batadv_gw_reselect(bat_priv); batadv_gw_reselect(bat_priv);
out: out:
if (curr_gw_orig) batadv_orig_node_put(curr_gw_orig);
batadv_orig_node_put(curr_gw_orig);
} }
/** /**
...@@ -456,13 +449,11 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, ...@@ -456,13 +449,11 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
if (gw_node == curr_gw) if (gw_node == curr_gw)
batadv_gw_reselect(bat_priv); batadv_gw_reselect(bat_priv);
if (curr_gw) batadv_gw_node_put(curr_gw);
batadv_gw_node_put(curr_gw);
} }
out: out:
if (gw_node) batadv_gw_node_put(gw_node);
batadv_gw_node_put(gw_node);
} }
/** /**
...@@ -545,8 +536,7 @@ int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -545,8 +536,7 @@ int batadv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
return ret; return ret;
...@@ -769,15 +759,10 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, ...@@ -769,15 +759,10 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
batadv_neigh_ifinfo_put(old_ifinfo); batadv_neigh_ifinfo_put(old_ifinfo);
out: out:
if (orig_dst_node) batadv_orig_node_put(orig_dst_node);
batadv_orig_node_put(orig_dst_node); batadv_gw_node_put(curr_gw);
if (curr_gw) batadv_gw_node_put(gw_node);
batadv_gw_node_put(curr_gw); batadv_neigh_node_put(neigh_old);
if (gw_node) batadv_neigh_node_put(neigh_curr);
batadv_gw_node_put(gw_node);
if (neigh_old)
batadv_neigh_node_put(neigh_old);
if (neigh_curr)
batadv_neigh_node_put(neigh_curr);
return out_of_range; return out_of_range;
} }
net/batman-adv/hard-interface.c
View file @ 79a0bffb
...@@ -236,8 +236,7 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev) ...@@ -236,8 +236,7 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev)
real_netdev = dev_get_by_index(real_net, ifindex); real_netdev = dev_get_by_index(real_net, ifindex);
out: out:
if (hard_iface) batadv_hardif_put(hard_iface);
batadv_hardif_put(hard_iface);
return real_netdev; return real_netdev;
} }
...@@ -457,8 +456,7 @@ static void batadv_primary_if_update_addr(struct batadv_priv *bat_priv, ...@@ -457,8 +456,7 @@ static void batadv_primary_if_update_addr(struct batadv_priv *bat_priv,
batadv_dat_init_own_addr(bat_priv, primary_if); batadv_dat_init_own_addr(bat_priv, primary_if);
batadv_bla_update_orig_address(bat_priv, primary_if, oldif); batadv_bla_update_orig_address(bat_priv, primary_if, oldif);
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
static void batadv_primary_if_select(struct batadv_priv *bat_priv, static void batadv_primary_if_select(struct batadv_priv *bat_priv,
...@@ -481,8 +479,7 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv, ...@@ -481,8 +479,7 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv,
batadv_primary_if_update_addr(bat_priv, curr_hard_iface); batadv_primary_if_update_addr(bat_priv, curr_hard_iface);
out: out:
if (curr_hard_iface) batadv_hardif_put(curr_hard_iface);
batadv_hardif_put(curr_hard_iface);
} }
static bool static bool
...@@ -657,8 +654,7 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) ...@@ -657,8 +654,7 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)
bat_priv->algo_ops->iface.activate(hard_iface); bat_priv->algo_ops->iface.activate(hard_iface);
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
static void static void
...@@ -811,8 +807,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) ...@@ -811,8 +807,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)
new_if = batadv_hardif_get_active(hard_iface->soft_iface); new_if = batadv_hardif_get_active(hard_iface->soft_iface);
batadv_primary_if_select(bat_priv, new_if); batadv_primary_if_select(bat_priv, new_if);
if (new_if) batadv_hardif_put(new_if);
batadv_hardif_put(new_if);
} }
bat_priv->algo_ops->iface.disable(hard_iface); bat_priv->algo_ops->iface.disable(hard_iface);
...@@ -834,8 +829,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) ...@@ -834,8 +829,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)
batadv_hardif_put(hard_iface); batadv_hardif_put(hard_iface);
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
static struct batadv_hard_iface * static struct batadv_hard_iface *
...@@ -990,8 +984,7 @@ static int batadv_hard_if_event(struct notifier_block *this, ...@@ -990,8 +984,7 @@ static int batadv_hard_if_event(struct notifier_block *this,
hardif_put: hardif_put:
batadv_hardif_put(hard_iface); batadv_hardif_put(hard_iface);
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
......
net/batman-adv/multicast.c
View file @ 79a0bffb
...@@ -2241,7 +2241,7 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb, ...@@ -2241,7 +2241,7 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb,
if (!ret && primary_if) if (!ret && primary_if)
*primary_if = hard_iface; *primary_if = hard_iface;
else if (hard_iface) else
batadv_hardif_put(hard_iface); batadv_hardif_put(hard_iface);
return ret; return ret;
......
net/batman-adv/netlink.c
View file @ 79a0bffb
...@@ -359,15 +359,13 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg, ...@@ -359,15 +359,13 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg,
atomic_read(&bat_priv->orig_interval))) atomic_read(&bat_priv->orig_interval)))
goto nla_put_failure; goto nla_put_failure;
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
genlmsg_end(msg, hdr); genlmsg_end(msg, hdr);
return 0; return 0;
nla_put_failure: nla_put_failure:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
genlmsg_cancel(msg, hdr); genlmsg_cancel(msg, hdr);
return -EMSGSIZE; return -EMSGSIZE;
......
net/batman-adv/network-coding.c
View file @ 79a0bffb
...@@ -936,10 +936,8 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, ...@@ -936,10 +936,8 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
out_nc_node->last_seen = jiffies; out_nc_node->last_seen = jiffies;
out: out:
if (in_nc_node) batadv_nc_node_put(in_nc_node);
batadv_nc_node_put(in_nc_node); batadv_nc_node_put(out_nc_node);
if (out_nc_node)
batadv_nc_node_put(out_nc_node);
} }
/** /**
...@@ -1215,14 +1213,10 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv, ...@@ -1215,14 +1213,10 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,
batadv_send_unicast_skb(skb_dest, first_dest); batadv_send_unicast_skb(skb_dest, first_dest);
res = true; res = true;
out: out:
if (router_neigh) batadv_neigh_node_put(router_neigh);
batadv_neigh_node_put(router_neigh); batadv_neigh_node_put(router_coding);
if (router_coding) batadv_neigh_ifinfo_put(router_neigh_ifinfo);
batadv_neigh_node_put(router_coding); batadv_neigh_ifinfo_put(router_coding_ifinfo);
if (router_neigh_ifinfo)
batadv_neigh_ifinfo_put(router_neigh_ifinfo);
if (router_coding_ifinfo)
batadv_neigh_ifinfo_put(router_coding_ifinfo);
return res; return res;
} }
......
net/batman-adv/originator.c
View file @ 79a0bffb
...@@ -664,8 +664,7 @@ batadv_neigh_node_create(struct batadv_orig_node *orig_node, ...@@ -664,8 +664,7 @@ batadv_neigh_node_create(struct batadv_orig_node *orig_node,
out: out:
spin_unlock_bh(&orig_node->neigh_list_lock); spin_unlock_bh(&orig_node->neigh_list_lock);
if (hardif_neigh) batadv_hardif_neigh_put(hardif_neigh);
batadv_hardif_neigh_put(hardif_neigh);
return neigh_node; return neigh_node;
} }
...@@ -757,11 +756,9 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -757,11 +756,9 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (hardif) batadv_hardif_put(hardif);
batadv_hardif_put(hardif);
dev_put(hard_iface); dev_put(hard_iface);
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
return ret; return ret;
...@@ -784,8 +781,7 @@ void batadv_orig_ifinfo_release(struct kref *ref) ...@@ -784,8 +781,7 @@ void batadv_orig_ifinfo_release(struct kref *ref)
/* this is the last reference to this object */ /* this is the last reference to this object */
router = rcu_dereference_protected(orig_ifinfo->router, true); router = rcu_dereference_protected(orig_ifinfo->router, true);
if (router) batadv_neigh_node_put(router);
batadv_neigh_node_put(router);
kfree_rcu(orig_ifinfo, rcu); kfree_rcu(orig_ifinfo, rcu);
} }
...@@ -843,8 +839,7 @@ void batadv_orig_node_release(struct kref *ref) ...@@ -843,8 +839,7 @@ void batadv_orig_node_release(struct kref *ref)
orig_node->last_bonding_candidate = NULL; orig_node->last_bonding_candidate = NULL;
spin_unlock_bh(&orig_node->neigh_list_lock); spin_unlock_bh(&orig_node->neigh_list_lock);
if (last_candidate) batadv_orig_ifinfo_put(last_candidate);
batadv_orig_ifinfo_put(last_candidate);
spin_lock_bh(&orig_node->vlan_list_lock); spin_lock_bh(&orig_node->vlan_list_lock);
hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) { hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
...@@ -1151,8 +1146,7 @@ batadv_find_best_neighbor(struct batadv_priv *bat_priv, ...@@ -1151,8 +1146,7 @@ batadv_find_best_neighbor(struct batadv_priv *bat_priv,
if (!kref_get_unless_zero(&neigh->refcount)) if (!kref_get_unless_zero(&neigh->refcount))
continue; continue;
if (best) batadv_neigh_node_put(best);
batadv_neigh_node_put(best);
best = neigh; best = neigh;
} }
...@@ -1197,8 +1191,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, ...@@ -1197,8 +1191,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
BATADV_IF_DEFAULT); BATADV_IF_DEFAULT);
batadv_update_route(bat_priv, orig_node, BATADV_IF_DEFAULT, batadv_update_route(bat_priv, orig_node, BATADV_IF_DEFAULT,
best_neigh_node); best_neigh_node);
if (best_neigh_node) batadv_neigh_node_put(best_neigh_node);
batadv_neigh_node_put(best_neigh_node);
/* ... then for all other interfaces. */ /* ... then for all other interfaces. */
rcu_read_lock(); rcu_read_lock();
...@@ -1217,8 +1210,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, ...@@ -1217,8 +1210,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
hard_iface); hard_iface);
batadv_update_route(bat_priv, orig_node, hard_iface, batadv_update_route(bat_priv, orig_node, hard_iface,
best_neigh_node); best_neigh_node);
if (best_neigh_node) batadv_neigh_node_put(best_neigh_node);
batadv_neigh_node_put(best_neigh_node);
batadv_hardif_put(hard_iface); batadv_hardif_put(hard_iface);
} }
...@@ -1348,11 +1340,9 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -1348,11 +1340,9 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (hardif) batadv_hardif_put(hardif);
batadv_hardif_put(hardif);
dev_put(hard_iface); dev_put(hard_iface);
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
return ret; return ret;
......
net/batman-adv/routing.c
View file @ 79a0bffb
...@@ -101,8 +101,7 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, ...@@ -101,8 +101,7 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,
} }
/* decrease refcount of previous best neighbor */ /* decrease refcount of previous best neighbor */
if (curr_router) batadv_neigh_node_put(curr_router);
batadv_neigh_node_put(curr_router);
} }
/** /**
...@@ -128,8 +127,7 @@ void batadv_update_route(struct batadv_priv *bat_priv, ...@@ -128,8 +127,7 @@ void batadv_update_route(struct batadv_priv *bat_priv,
_batadv_update_route(bat_priv, orig_node, recv_if, neigh_node); _batadv_update_route(bat_priv, orig_node, recv_if, neigh_node);
out: out:
if (router) batadv_neigh_node_put(router);
batadv_neigh_node_put(router);
} }
/** /**
...@@ -269,10 +267,8 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, ...@@ -269,10 +267,8 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,
goto out; goto out;
} }
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_orig_node_put(orig_node);
if (orig_node)
batadv_orig_node_put(orig_node);
kfree_skb(skb); kfree_skb(skb);
...@@ -324,10 +320,8 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, ...@@ -324,10 +320,8 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
skb = NULL; skb = NULL;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_orig_node_put(orig_node);
if (orig_node)
batadv_orig_node_put(orig_node);
kfree_skb(skb); kfree_skb(skb);
...@@ -425,8 +419,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, ...@@ -425,8 +419,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
skb = NULL; skb = NULL;
put_orig_node: put_orig_node:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
free_skb: free_skb:
kfree_skb(skb); kfree_skb(skb);
...@@ -513,8 +506,7 @@ batadv_last_bonding_replace(struct batadv_orig_node *orig_node, ...@@ -513,8 +506,7 @@ batadv_last_bonding_replace(struct batadv_orig_node *orig_node,
orig_node->last_bonding_candidate = new_candidate; orig_node->last_bonding_candidate = new_candidate;
spin_unlock_bh(&orig_node->neigh_list_lock); spin_unlock_bh(&orig_node->neigh_list_lock);
if (old_candidate) batadv_orig_ifinfo_put(old_candidate);
batadv_orig_ifinfo_put(old_candidate);
} }
/** /**
...@@ -656,8 +648,7 @@ batadv_find_router(struct batadv_priv *bat_priv, ...@@ -656,8 +648,7 @@ batadv_find_router(struct batadv_priv *bat_priv,
batadv_orig_ifinfo_put(next_candidate); batadv_orig_ifinfo_put(next_candidate);
} }
if (last_candidate) batadv_orig_ifinfo_put(last_candidate);
batadv_orig_ifinfo_put(last_candidate);
return router; return router;
} }
...@@ -785,10 +776,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, ...@@ -785,10 +776,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
ret = true; ret = true;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_orig_node_put(orig_node);
if (orig_node)
batadv_orig_node_put(orig_node);
return ret; return ret;
} }
...@@ -1031,8 +1020,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, ...@@ -1031,8 +1020,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
orig_node); orig_node);
rx_success: rx_success:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
} }
...@@ -1279,7 +1267,6 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, ...@@ -1279,7 +1267,6 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
kfree_skb(skb); kfree_skb(skb);
ret = NET_RX_DROP; ret = NET_RX_DROP;
out: out:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
return ret; return ret;
} }
net/batman-adv/send.c
View file @ 79a0bffb
...@@ -152,8 +152,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb, ...@@ -152,8 +152,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb,
if (hardif_neigh && ret != NET_XMIT_DROP) if (hardif_neigh && ret != NET_XMIT_DROP)
hardif_neigh->bat_v.last_unicast_tx = jiffies; hardif_neigh->bat_v.last_unicast_tx = jiffies;
if (hardif_neigh) batadv_hardif_neigh_put(hardif_neigh);
batadv_hardif_neigh_put(hardif_neigh);
#endif #endif
return ret; return ret;
...@@ -309,8 +308,7 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv, ...@@ -309,8 +308,7 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv,
ret = true; ret = true;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
return ret; return ret;
} }
...@@ -425,8 +423,7 @@ int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv, ...@@ -425,8 +423,7 @@ int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv,
ret = batadv_send_skb_unicast(bat_priv, skb, packet_type, ret = batadv_send_skb_unicast(bat_priv, skb, packet_type,
packet_subtype, orig_node, vid); packet_subtype, orig_node, vid);
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
return ret; return ret;
} }
...@@ -452,8 +449,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, ...@@ -452,8 +449,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
ret = batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR, ret = batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
BATADV_P_DATA, orig_node, vid); BATADV_P_DATA, orig_node, vid);
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
return ret; return ret;
} }
...@@ -474,10 +470,8 @@ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet, ...@@ -474,10 +470,8 @@ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet,
else else
consume_skb(forw_packet->skb); consume_skb(forw_packet->skb);
if (forw_packet->if_incoming) batadv_hardif_put(forw_packet->if_incoming);
batadv_hardif_put(forw_packet->if_incoming); batadv_hardif_put(forw_packet->if_outgoing);
if (forw_packet->if_outgoing)
batadv_hardif_put(forw_packet->if_outgoing);
if (forw_packet->queue_left) if (forw_packet->queue_left)
atomic_inc(forw_packet->queue_left); atomic_inc(forw_packet->queue_left);
kfree(forw_packet); kfree(forw_packet);
...@@ -867,8 +861,7 @@ static bool batadv_send_no_broadcast(struct batadv_priv *bat_priv, ...@@ -867,8 +861,7 @@ static bool batadv_send_no_broadcast(struct batadv_priv *bat_priv,
ret = batadv_hardif_no_broadcast(if_out, bcast_packet->orig, ret = batadv_hardif_no_broadcast(if_out, bcast_packet->orig,
orig_neigh); orig_neigh);
if (neigh_node) batadv_hardif_neigh_put(neigh_node);
batadv_hardif_neigh_put(neigh_node);
/* ok, may broadcast */ /* ok, may broadcast */
if (!ret) if (!ret)
......
net/batman-adv/soft-interface.c
View file @ 79a0bffb
...@@ -383,10 +383,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, ...@@ -383,10 +383,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,
dropped_freed: dropped_freed:
batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED); batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED);
end: end:
if (mcast_single_orig) batadv_orig_node_put(mcast_single_orig);
batadv_orig_node_put(mcast_single_orig); batadv_hardif_put(primary_if);
if (primary_if)
batadv_hardif_put(primary_if);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
...@@ -838,8 +836,7 @@ static int batadv_softif_slave_add(struct net_device *dev, ...@@ -838,8 +836,7 @@ static int batadv_softif_slave_add(struct net_device *dev,
ret = batadv_hardif_enable_interface(hard_iface, dev); ret = batadv_hardif_enable_interface(hard_iface, dev);
out: out:
if (hard_iface) batadv_hardif_put(hard_iface);
batadv_hardif_put(hard_iface);
return ret; return ret;
} }
...@@ -865,8 +862,7 @@ static int batadv_softif_slave_del(struct net_device *dev, ...@@ -865,8 +862,7 @@ static int batadv_softif_slave_del(struct net_device *dev,
ret = 0; ret = 0;
out: out:
if (hard_iface) batadv_hardif_put(hard_iface);
batadv_hardif_put(hard_iface);
return ret; return ret;
} }
......
net/batman-adv/tp_meter.c
View file @ 79a0bffb
...@@ -751,12 +751,9 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv, ...@@ -751,12 +751,9 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv,
wake_up(&tp_vars->more_bytes); wake_up(&tp_vars->more_bytes);
out: out:
if (likely(primary_if)) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_orig_node_put(orig_node);
if (likely(orig_node)) batadv_tp_vars_put(tp_vars);
batadv_orig_node_put(orig_node);
if (likely(tp_vars))
batadv_tp_vars_put(tp_vars);
} }
/** /**
...@@ -885,10 +882,8 @@ static int batadv_tp_send(void *arg) ...@@ -885,10 +882,8 @@ static int batadv_tp_send(void *arg)
} }
out: out:
if (likely(primary_if)) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if); batadv_orig_node_put(orig_node);
if (likely(orig_node))
batadv_orig_node_put(orig_node);
batadv_tp_sender_end(bat_priv, tp_vars); batadv_tp_sender_end(bat_priv, tp_vars);
batadv_tp_sender_cleanup(bat_priv, tp_vars); batadv_tp_sender_cleanup(bat_priv, tp_vars);
...@@ -1208,10 +1203,8 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst, ...@@ -1208,10 +1203,8 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst,
ret = 0; ret = 0;
out: out:
if (likely(orig_node)) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node); batadv_hardif_put(primary_if);
if (likely(primary_if))
batadv_hardif_put(primary_if);
return ret; return ret;
} }
...@@ -1459,8 +1452,7 @@ static void batadv_tp_recv_msg(struct batadv_priv *bat_priv, ...@@ -1459,8 +1452,7 @@ static void batadv_tp_recv_msg(struct batadv_priv *bat_priv,
batadv_tp_send_ack(bat_priv, icmp->orig, tp_vars->last_recv, batadv_tp_send_ack(bat_priv, icmp->orig, tp_vars->last_recv,
icmp->timestamp, icmp->session, icmp->uid); icmp->timestamp, icmp->session, icmp->uid);
out: out:
if (likely(tp_vars)) batadv_tp_vars_put(tp_vars);
batadv_tp_vars_put(tp_vars);
} }
/** /**
......
net/batman-adv/translation-table.c
View file @ 79a0bffb
...@@ -813,13 +813,10 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, ...@@ -813,13 +813,10 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr,
ret = true; ret = true;
out: out:
if (in_hardif) batadv_hardif_put(in_hardif);
batadv_hardif_put(in_hardif);
dev_put(in_dev); dev_put(in_dev);
if (tt_local) batadv_tt_local_entry_put(tt_local);
batadv_tt_local_entry_put(tt_local); batadv_tt_global_entry_put(tt_global);
if (tt_global)
batadv_tt_global_entry_put(tt_global);
return ret; return ret;
} }
...@@ -1209,8 +1206,7 @@ int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -1209,8 +1206,7 @@ int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
cb->args[0] = bucket; cb->args[0] = bucket;
...@@ -1298,8 +1294,7 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr, ...@@ -1298,8 +1294,7 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,
batadv_tt_local_entry_put(tt_removed_entry); batadv_tt_local_entry_put(tt_removed_entry);
out: out:
if (tt_local_entry) batadv_tt_local_entry_put(tt_local_entry);
batadv_tt_local_entry_put(tt_local_entry);
return curr_flags; return curr_flags;
} }
...@@ -1569,8 +1564,7 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, ...@@ -1569,8 +1564,7 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global,
sync_flags: sync_flags:
batadv_tt_global_sync_flags(tt_global); batadv_tt_global_sync_flags(tt_global);
out: out:
if (orig_entry) batadv_tt_orig_list_entry_put(orig_entry);
batadv_tt_orig_list_entry_put(orig_entry);
spin_unlock_bh(&tt_global->list_lock); spin_unlock_bh(&tt_global->list_lock);
} }
...@@ -1743,10 +1737,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, ...@@ -1743,10 +1737,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv,
tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_ROAM; tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_ROAM;
out: out:
if (tt_global_entry) batadv_tt_global_entry_put(tt_global_entry);
batadv_tt_global_entry_put(tt_global_entry); batadv_tt_local_entry_put(tt_local_entry);
if (tt_local_entry)
batadv_tt_local_entry_put(tt_local_entry);
return ret; return ret;
} }
...@@ -1782,15 +1774,13 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv, ...@@ -1782,15 +1774,13 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv,
} }
/* release the refcount for the "old" best */ /* release the refcount for the "old" best */
if (best_router) batadv_neigh_node_put(best_router);
batadv_neigh_node_put(best_router);
best_entry = orig_entry; best_entry = orig_entry;
best_router = router; best_router = router;
} }
if (best_router) batadv_neigh_node_put(best_router);
batadv_neigh_node_put(best_router);
return best_entry; return best_entry;
} }
...@@ -1996,8 +1986,7 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -1996,8 +1986,7 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb)
ret = msg->len; ret = msg->len;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
dev_put(soft_iface); dev_put(soft_iface);
cb->args[0] = bucket; cb->args[0] = bucket;
...@@ -2188,10 +2177,8 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, ...@@ -2188,10 +2177,8 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,
} }
out: out:
if (tt_global_entry) batadv_tt_global_entry_put(tt_global_entry);
batadv_tt_global_entry_put(tt_global_entry); batadv_tt_local_entry_put(local_entry);
if (local_entry)
batadv_tt_local_entry_put(local_entry);
} }
/** /**
...@@ -2418,10 +2405,8 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, ...@@ -2418,10 +2405,8 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,
rcu_read_unlock(); rcu_read_unlock();
out: out:
if (tt_global_entry) batadv_tt_global_entry_put(tt_global_entry);
batadv_tt_global_entry_put(tt_global_entry); batadv_tt_local_entry_put(tt_local_entry);
if (tt_local_entry)
batadv_tt_local_entry_put(tt_local_entry);
return orig_node; return orig_node;
} }
...@@ -2982,8 +2967,7 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv, ...@@ -2982,8 +2967,7 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,
ret = true; ret = true;
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
if (ret && tt_req_node) { if (ret && tt_req_node) {
spin_lock_bh(&bat_priv->tt.req_list_lock); spin_lock_bh(&bat_priv->tt.req_list_lock);
...@@ -2994,8 +2978,7 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv, ...@@ -2994,8 +2978,7 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,
spin_unlock_bh(&bat_priv->tt.req_list_lock); spin_unlock_bh(&bat_priv->tt.req_list_lock);
} }
if (tt_req_node) batadv_tt_req_node_put(tt_req_node);
batadv_tt_req_node_put(tt_req_node);
kfree(tvlv_tt_data); kfree(tvlv_tt_data);
return ret; return ret;
...@@ -3126,10 +3109,8 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, ...@@ -3126,10 +3109,8 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv,
spin_unlock_bh(&req_dst_orig_node->tt_buff_lock); spin_unlock_bh(&req_dst_orig_node->tt_buff_lock);
out: out:
if (res_dst_orig_node) batadv_orig_node_put(res_dst_orig_node);
batadv_orig_node_put(res_dst_orig_node); batadv_orig_node_put(req_dst_orig_node);
if (req_dst_orig_node)
batadv_orig_node_put(req_dst_orig_node);
kfree(tvlv_tt_data); kfree(tvlv_tt_data);
return ret; return ret;
} }
...@@ -3243,10 +3224,8 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, ...@@ -3243,10 +3224,8 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
spin_unlock_bh(&bat_priv->tt.last_changeset_lock); spin_unlock_bh(&bat_priv->tt.last_changeset_lock);
out: out:
spin_unlock_bh(&bat_priv->tt.commit_lock); spin_unlock_bh(&bat_priv->tt.commit_lock);
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node); batadv_hardif_put(primary_if);
if (primary_if)
batadv_hardif_put(primary_if);
kfree(tvlv_tt_data); kfree(tvlv_tt_data);
/* The packet was for this host, so it doesn't need to be re-routed */ /* The packet was for this host, so it doesn't need to be re-routed */
return true; return true;
...@@ -3331,8 +3310,7 @@ static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, ...@@ -3331,8 +3310,7 @@ static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
atomic_set(&orig_node->last_ttvn, ttvn); atomic_set(&orig_node->last_ttvn, ttvn);
out: out:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
} }
static void batadv_tt_update_changes(struct batadv_priv *bat_priv, static void batadv_tt_update_changes(struct batadv_priv *bat_priv,
...@@ -3373,8 +3351,7 @@ bool batadv_is_my_client(struct batadv_priv *bat_priv, const u8 *addr, ...@@ -3373,8 +3351,7 @@ bool batadv_is_my_client(struct batadv_priv *bat_priv, const u8 *addr,
goto out; goto out;
ret = true; ret = true;
out: out:
if (tt_local_entry) batadv_tt_local_entry_put(tt_local_entry);
batadv_tt_local_entry_put(tt_local_entry);
return ret; return ret;
} }
...@@ -3437,8 +3414,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, ...@@ -3437,8 +3414,7 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,
spin_unlock_bh(&bat_priv->tt.req_list_lock); spin_unlock_bh(&bat_priv->tt.req_list_lock);
out: out:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
} }
static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv) static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv)
...@@ -3569,8 +3545,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, u8 *client, ...@@ -3569,8 +3545,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, u8 *client,
&tvlv_roam, sizeof(tvlv_roam)); &tvlv_roam, sizeof(tvlv_roam));
out: out:
if (primary_if) batadv_hardif_put(primary_if);
batadv_hardif_put(primary_if);
} }
static void batadv_tt_purge(struct work_struct *work) static void batadv_tt_purge(struct work_struct *work)
...@@ -4165,8 +4140,7 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv, ...@@ -4165,8 +4140,7 @@ static int batadv_roam_tvlv_unicast_handler_v1(struct batadv_priv *bat_priv,
atomic_read(&orig_node->last_ttvn) + 1); atomic_read(&orig_node->last_ttvn) + 1);
out: out:
if (orig_node) batadv_orig_node_put(orig_node);
batadv_orig_node_put(orig_node);
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
} }
......
net/batman-adv/tvlv.c
View file @ 79a0bffb
...@@ -444,8 +444,7 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, ...@@ -444,8 +444,7 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,
ogm_source, orig_node, ogm_source, orig_node,
src, dst, tvlv_value, src, dst, tvlv_value,
tvlv_value_cont_len); tvlv_value_cont_len);
if (tvlv_handler) batadv_tvlv_handler_put(tvlv_handler);
batadv_tvlv_handler_put(tvlv_handler);
tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len; tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len;
tvlv_value_len -= tvlv_value_cont_len; tvlv_value_len -= tvlv_value_cont_len;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7