From: Marc Kleine-Budde Date: Wed, 31 Oct 2018 13:05:26 +0000 (+0100) Subject: can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is acces... X-Git-Tag: v4.14.85~58 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf991335b02d62e067e09471b15cf2216d54d5cf;p=platform%2Fkernel%2Flinux-rpi.git can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed out of bounds commit e7a6994d043a1e31d5b17706a22ce33d2a3e4cdc upstream. If the "struct can_priv::echo_skb" is accessed out of bounds would lead to a kernel crash. Better print a sensible warning message instead and try to recover. Cc: linux-stable Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 7900d5a39989..7d61d8801220 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -480,7 +480,11 @@ struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 { struct can_priv *priv = netdev_priv(dev); - BUG_ON(idx >= priv->echo_skb_max); + if (idx >= priv->echo_skb_max) { + netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n", + __func__, idx, priv->echo_skb_max); + return NULL; + } if (priv->echo_skb[idx]) { /* Using "struct canfd_frame::len" for the frame