OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e506d40
)
sunvnet: fix potential NULL pointer dereference
author
David L Stevens
<david.stevens@oracle.com>
Wed, 1 Oct 2014 15:05:27 +0000
(11:05 -0400)
committer
David S. Miller
<davem@davemloft.net>
Wed, 1 Oct 2014 19:26:09 +0000
(15:26 -0400)
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: David L Stevens <david.stevens@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sun/sunvnet.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/sun/sunvnet.c
b/drivers/net/ethernet/sun/sunvnet.c
index
1262697
..
1539672
100644
(file)
--- a/
drivers/net/ethernet/sun/sunvnet.c
+++ b/
drivers/net/ethernet/sun/sunvnet.c
@@
-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;