Skip to contentSkip to conversation

sunvnet: fix potential NULL pointer dereference

PATCH Applied David L Stevens 2 participants 2 messages Oct 1, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/ethernet/sun/sunvnet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ethernet/sun/sunvnet.c +1 -1
index 1262697..1539672 100644
@@ -1073,7 +1073,7 @@ out_dropped:
 	if (pending)
 		(void)mod_timer(&port->clean_timer,
 				jiffies + VNET_CLEAN_TIMEOUT);
-	else
+	else if (port)
 		del_timer(&port->clean_timer);
 	dev->stats.tx_dropped++;
 	return NETDEV_TX_OK;
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: David L Stevens <[email protected]>
Date: Wed, 01 Oct 2014 11:05:27 -0400

Quoted 4 lines

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.

Applied, thanks David.