projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0e0c80
)
can: dev: can_put_echo_skb(): don't crash kernel if can_priv::echo_skb is accessed...
author
Marc Kleine-Budde
<mkl@pengutronix.de>
Fri, 29 Sep 2023 08:23:47 +0000
(10:23 +0200)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Thu, 5 Oct 2023 19:34:13 +0000
(21:34 +0200)
If the "struct can_priv::echoo_skb" is accessed out of bounds, this
would cause a kernel crash. Instead, issue a meaningful warning
message and return with an error.
Fixes:
a6e4bc530403
("can: make the number of echo skb's configurable")
Link:
https://lore.kernel.org/all/20231005-can-dev-fix-can-restart-v2-5-91b5c1fd922c@pengutronix.de
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev/skb.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/dev/skb.c
b/drivers/net/can/dev/skb.c
index
f6d05b3
..
3ebd4f7
100644
(file)
--- a/
drivers/net/can/dev/skb.c
+++ b/
drivers/net/can/dev/skb.c
@@
-49,7
+49,11
@@
int can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
{
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 -EINVAL;
+ }
/* check flag whether this packet has to be looped back */
if (!(dev->flags & IFF_ECHO) ||