summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorMarc Kleine-Budde2015-07-11 21:16:08 +0200
committerMarc Kleine-Budde2015-07-15 09:04:28 +0200
commit296decb6931fca0bbc0bfb26865837d52e287599 (patch)
treebd43895ec5524227243ff3cbabc0af5b0c3e89e1 /drivers/net/can
parentcan: sja1000: don't touch skb after netif_rx() (diff)
downloadkernel-qcow2-linux-296decb6931fca0bbc0bfb26865837d52e287599.tar.gz
kernel-qcow2-linux-296decb6931fca0bbc0bfb26865837d52e287599.tar.xz
kernel-qcow2-linux-296decb6931fca0bbc0bfb26865837d52e287599.zip
can: esd_usb2: don't touch skb after netif_rx()
There is no guarantee that the skb is in the same state after calling net_receive_skb() or netif_rx(). It might be freed or reused. Not really harmful as its a read access, except you turn on the proper debugging options which catch a use after free. Cc: Thomas Körper <thomas.koerper@esd.eu> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/usb/esd_usb2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 411c1af92c62..0e5a4493ba4f 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -301,13 +301,12 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
cf->data[7] = rxerr;
}
- netif_rx(skb);
-
priv->bec.txerr = txerr;
priv->bec.rxerr = rxerr;
stats->rx_packets++;
stats->rx_bytes += cf->can_dlc;
+ netif_rx(skb);
}
}
@@ -347,10 +346,9 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv,
cf->data[i] = msg->msg.rx.data[i];
}
- netif_rx(skb);
-
stats->rx_packets++;
stats->rx_bytes += cf->can_dlc;
+ netif_rx(skb);
}
return;