From: Marek Vasut Date: Fri, 30 Oct 2015 12:48:19 +0000 (+0100) Subject: can: Use correct type in sizeof() in nla_put() X-Git-Tag: v4.1.12-92~201^2~44 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f316d41f030f274dc6b73dccbcb59d460b88696e;p=users%2Fjedix%2Flinux-maple.git can: Use correct type in sizeof() in nla_put() Orabug: 22623851 commit 562b103a21974c2f9cd67514d110f918bb3e1796 upstream. 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 Cc: Wolfgang Grandegger Cc: netdev@vger.kernel.org Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 85f576c6806ee1a73be10b67b57a2a8f33a5611c) Signed-off-by: Dan Duval --- diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index aede704605c66..141c2a42d7eda 100644 --- 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) ||