Commit a29c9c43 authored by David L Stevens's avatar David L Stevens Committed by David S. Miller

sunvnet: fix potential NULL pointer dereference

One of the error cases for vnet_start_xmit()'s "out_dropped" label
is port == NULL, so only mess with port->clean_timer when port is not NULL.
Signed-off-by: default avatarDavid L Stevens <david.stevens@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e506d405
...@@ -1073,7 +1073,7 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1073,7 +1073,7 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (pending) if (pending)
(void)mod_timer(&port->clean_timer, (void)mod_timer(&port->clean_timer,
jiffies + VNET_CLEAN_TIMEOUT); jiffies + VNET_CLEAN_TIMEOUT);
else else if (port)
del_timer(&port->clean_timer); del_timer(&port->clean_timer);
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;
......
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