| Message ID | 546383B7.2090106@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On (11/12/14 10:58), David L Stevens wrote: > --- a/drivers/net/ethernet/sun/sunvnet.c > +++ b/drivers/net/ethernet/sun/sunvnet.c > @@ -958,6 +958,8 @@ vnet_select_queue(struct net_device *dev, struct sk_buff *skb, > struct vnet *vp = netdev_priv(dev); > struct vnet_port *port = __tx_port_find(vp, skb); > > + if (port == NULL) > + return 0; > return port->q_index; > } Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Thanks! Sowmini -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David L Stevens <david.stevens@oracle.com> Date: Wed, 12 Nov 2014 10:58:47 -0500 > This patch fixes a NULL pointer dereference when __tx_port_find() doesn't > find a matching port. > > Signed-off-by: David L Stevens <david.stevens@oracle.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 55d66c9..a556eba 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -958,6 +958,8 @@ vnet_select_queue(struct net_device *dev, struct sk_buff *skb, struct vnet *vp = netdev_priv(dev); struct vnet_port *port = __tx_port_find(vp, skb); + if (port == NULL) + return 0; return port->q_index; }
This patch fixes a NULL pointer dereference when __tx_port_find() doesn't find a matching port. Signed-off-by: David L Stevens <david.stevens@oracle.com> --- drivers/net/ethernet/sun/sunvnet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)