OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89bc784
)
can: Use correct type in sizeof() in nla_put()
author
Marek Vasut
<marex@denx.de>
Fri, 30 Oct 2015 12:48:19 +0000
(13:48 +0100)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Fri, 30 Oct 2015 13:33:26 +0000
(14:33 +0100)
The sizeof() is invoked on an incorrect variable, likely due to some
copy-paste error, and this might result in memory corruption. Fix this.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: netdev@vger.kernel.org
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/dev.c
b/drivers/net/can/dev.c
index
aede704
..
141c2a4
100644
(file)
--- a/
drivers/net/can/dev.c
+++ b/
drivers/net/can/dev.c
@@
-915,7
+915,7
@@
static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
nla_put(skb, IFLA_CAN_BITTIMING_CONST,
sizeof(*priv->bittiming_const), priv->bittiming_const)) ||
- nla_put(skb, IFLA_CAN_CLOCK, sizeof(
cm
), &priv->clock) ||
+ nla_put(skb, IFLA_CAN_CLOCK, sizeof(
priv->clock
), &priv->clock) ||
nla_put_u32(skb, IFLA_CAN_STATE, state) ||
nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||
nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||