mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
net: fix network drivers ndo_start_xmit() return values (part 2)
Fix up IRDA drivers that return an errno value to qdisc_restart(), causing qdisc_restart() to print a warning an requeue/retransmit the skb. - donauboe: intention appears to be to have the skb retransmitted without error message - irda-usb: intention is to drop silently according to comment - kingsub-sir: skb is freed: use after free - ks959-sir: skb is freed: use after free - ksdazzle-sir: skb is freed: use after free - mcs7880: skb is freed: use after free All but donauboe compile tested. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3790c8cdb9
commit
4bd73ae268
6 changed files with 9 additions and 24 deletions
|
@ -994,11 +994,11 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
/* change speed pending, wait for its execution */
|
||||
if (self->new_speed)
|
||||
return -EBUSY;
|
||||
return NETDEV_TX_BUSY;
|
||||
|
||||
/* device stopped (apm) wait for restart */
|
||||
if (self->stopped)
|
||||
return -EBUSY;
|
||||
return NETDEV_TX_BUSY;
|
||||
|
||||
toshoboe_checkstuck (self);
|
||||
|
||||
|
@ -1049,7 +1049,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
|
|||
if (self->txpending)
|
||||
{
|
||||
spin_unlock_irqrestore(&self->spinlock, flags);
|
||||
return -EBUSY;
|
||||
return NETDEV_TX_BUSY;
|
||||
}
|
||||
|
||||
/* If in SIR mode we need to generate a string of XBOFs */
|
||||
|
@ -1105,7 +1105,7 @@ dumpbufs(skb->data,skb->len,'>');
|
|||
,skb->len, self->ring->tx[self->txs].control, self->txpending);
|
||||
toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);
|
||||
spin_unlock_irqrestore(&self->spinlock, flags);
|
||||
return -EBUSY;
|
||||
return NETDEV_TX_BUSY;
|
||||
}
|
||||
|
||||
if (INB (OBOE_ENABLEH) & OBOE_ENABLEH_SIRON)
|
||||
|
|
|
@ -389,7 +389,6 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
s32 speed;
|
||||
s16 xbofs;
|
||||
int res, mtt;
|
||||
int err = 1; /* Failed */
|
||||
|
||||
IRDA_DEBUG(4, "%s() on %s\n", __func__, netdev->name);
|
||||
|
||||
|
@ -430,7 +429,6 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
irda_usb_change_speed_xbofs(self);
|
||||
netdev->trans_start = jiffies;
|
||||
/* Will netif_wake_queue() in callback */
|
||||
err = 0; /* No error */
|
||||
goto drop;
|
||||
}
|
||||
}
|
||||
|
@ -542,7 +540,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
/* Drop silently the skb and exit */
|
||||
dev_kfree_skb(skb);
|
||||
spin_unlock_irqrestore(&self->lock, flags);
|
||||
return err; /* Usually 1 */
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
|
|
|
@ -156,9 +156,6 @@ static int kingsun_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
int wraplen;
|
||||
int ret = 0;
|
||||
|
||||
if (skb == NULL || netdev == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
netif_stop_queue(netdev);
|
||||
|
||||
/* the IRDA wrapping routines don't deal with non linear skb */
|
||||
|
@ -197,7 +194,7 @@ static int kingsun_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
dev_kfree_skb(skb);
|
||||
spin_unlock(&kingsun->lock);
|
||||
|
||||
return ret;
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/* Receive callback function */
|
||||
|
|
|
@ -391,9 +391,6 @@ static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
unsigned int wraplen;
|
||||
int ret = 0;
|
||||
|
||||
if (skb == NULL || netdev == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
netif_stop_queue(netdev);
|
||||
|
||||
/* the IRDA wrapping routines don't deal with non linear skb */
|
||||
|
@ -428,7 +425,7 @@ static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
dev_kfree_skb(skb);
|
||||
spin_unlock(&kingsun->lock);
|
||||
|
||||
return ret;
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/* Receive callback function */
|
||||
|
|
|
@ -304,9 +304,6 @@ static int ksdazzle_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
unsigned int wraplen;
|
||||
int ret = 0;
|
||||
|
||||
if (skb == NULL || netdev == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
netif_stop_queue(netdev);
|
||||
|
||||
/* the IRDA wrapping routines don't deal with non linear skb */
|
||||
|
@ -341,7 +338,7 @@ static int ksdazzle_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
|
|||
dev_kfree_skb(skb);
|
||||
spin_unlock(&kingsun->lock);
|
||||
|
||||
return ret;
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/* Receive callback function */
|
||||
|
|
|
@ -824,10 +824,6 @@ static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|||
int wraplen;
|
||||
int ret = 0;
|
||||
|
||||
|
||||
if (skb == NULL || ndev == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
netif_stop_queue(ndev);
|
||||
mcs = netdev_priv(ndev);
|
||||
|
||||
|
@ -870,7 +866,7 @@ static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|||
|
||||
dev_kfree_skb(skb);
|
||||
spin_unlock_irqrestore(&mcs->lock, flags);
|
||||
return ret;
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
static const struct net_device_ops mcs_netdev_ops = {
|
||||
|
|
Loading…
Reference in a new issue