Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2efd32ee1b60b0b31404ca47c1ce70e5a5d24ebc

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 1f1e495806
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

veth: fix a NULL deref in netif_carrier_off 

In commit d0e2c55e7c94 (veth: avoid a NULL deref in veth_stats_one)
we now clear the peer pointers in veth_dellink()

veth_close() must therefore make sure the peer pointer is set.

Reported-by: Tom Parkin <tom.parkin@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

... ... @@ -206,9 +206,11 @@
206 206 static int veth_close(struct net_device *dev)
207 207 {
208 208 struct veth_priv *priv = netdev_priv(dev);
  209 + struct net_device *peer = rtnl_dereference(priv->peer);
209 210  
210 211 netif_carrier_off(dev);
211   - netif_carrier_off(rtnl_dereference(priv->peer));
  212 + if (peer)
  213 + netif_carrier_off(peer);
212 214  
213 215 return 0;
214 216 }