can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is acces...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 31 Oct 2018 13:05:26 +0000 (14:05 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 9 Nov 2018 16:20:43 +0000 (17:20 +0100)
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 <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev.c

index 46cc5fec4043d9a8e93699d0ac487699aad6c27f..c05e4d50d43d74a32ef38c656fb85bbb8b06e962 100644 (file)
@@ -481,7 +481,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