Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ccd4c61 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by David S. Miller
Browse files

can: Unify droping of invalid tx skbs and netdev stats 



To prevent the CAN drivers to operate on invalid socketbuffers the skbs are
now checked and silently dropped at the xmit-function consistently.

Also the netdev stats are consistently using the CAN data length code (dlc)
for [rx|tx]_bytes now.

Signed-off-by: default avatarOliver Hartkopp <oliver@hartkopp.net>
Acked-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d218d111

drivers/net/can/at91_can.c

+3 −0
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	unsigned int mb, prio;

	u32 reg_mid, reg_mcr;



	if (can_dropped_invalid_skb(dev, skb))

		return NETDEV_TX_OK;



	mb = get_tx_next_mb(priv);

	prio = get_tx_next_prio(priv);

drivers/net/can/bfin_can.c

+3 −0
Original line number Diff line number Diff line
@@ -318,6 +318,9 @@ static int bfin_can_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	u16 val;

	int i;



	if (can_dropped_invalid_skb(dev, skb))

		return NETDEV_TX_OK;



	netif_stop_queue(dev);



	/* fill id */

drivers/net/can/mcp251x.c

+1 −5
Original line number Diff line number Diff line
@@ -494,12 +494,8 @@ static netdev_tx_t mcp251x_hard_start_xmit(struct sk_buff *skb, 
		return NETDEV_TX_BUSY;

	}



	if (skb->len != sizeof(struct can_frame)) {

		dev_err(&spi->dev, "dropping packet - bad length\n");

		dev_kfree_skb(skb);

		net->stats.tx_dropped++;

	if (can_dropped_invalid_skb(net, skb))

		return NETDEV_TX_OK;

	}



	netif_stop_queue(net);

	priv->tx_skb = skb;

drivers/net/can/mscan/mscan.c

+1 −4
Original line number Diff line number Diff line
@@ -204,11 +204,8 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	int i, rtr, buf_id;

	u32 can_id;



	if (skb->len != sizeof(*frame) || frame->can_dlc > 8) {

		kfree_skb(skb);

		dev->stats.tx_dropped++;

	if (can_dropped_invalid_skb(dev, skb))

		return NETDEV_TX_OK;

	}



	out_8(&regs->cantier, 0);

drivers/net/can/sja1000/sja1000.c

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb, 
	uint8_t dreg;

	int i;



	if (can_dropped_invalid_skb(dev, skb))

		return NETDEV_TX_OK;



	netif_stop_queue(dev);



	fi = dlc = cf->can_dlc;