Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/linux-merge

davem330 · davem330 · commit 7de84403a202 · 2017-06-13T13:46:01.000-04:00
Simon Wunderlich says:

====================
Here are two batman-adv bugfixes:

 - fix rx packet counters for local ARP replies, by Sven Eckelmann

 - fix memory leaks for unicast packetes received from another gateway
   in bridge loop avoidance, by Andreas Pape
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
@@ -1064,8 +1064,9 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
 
 		skb_new->protocol = eth_type_trans(skb_new, soft_iface);
 
-		soft_iface->stats.rx_packets++;
-		soft_iface->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size;
+		batadv_inc_counter(bat_priv, BATADV_CNT_RX);
+		batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
+				   skb->len + ETH_HLEN + hdr_size);
 
 		netif_rx(skb_new);
 		batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n");
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
@@ -987,7 +987,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
 				batadv_dbg(BATADV_DBG_BLA, bat_priv,
 					   "recv_unicast_packet(): Dropped unicast pkt received from another backbone gw %pM.\n",
 					   orig_addr_gw);
-				return NET_RX_DROP;
+				goto free_skb;
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,`
`987`	`987`	`batadv_dbg(BATADV_DBG_BLA, bat_priv,`
`988`	`988`	`"recv_unicast_packet(): Dropped unicast pkt received from another backbone gw %pM.\n",`
`989`	`989`	`orig_addr_gw);`
`990`		`- return NET_RX_DROP;`
	`990`	`+ goto free_skb;`
`991`	`991`	`}`
`992`	`992`	`}`
`993`	`993`