]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: Use correct type in sizeof() in nla_put()
authorMarek Vasut <marex@denx.de>
Fri, 30 Oct 2015 12:48:19 +0000 (13:48 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Sun, 13 Dec 2015 17:48:59 +0000 (17:48 +0000)
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 <marex@denx.de>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/net/can/dev.c

index c543c3aaee4d4e8bad354cde898f736ca46ba4a7..5635c6e7af579ecd4ddf801808693bb37e3130bd 100644 (file)
@@ -835,7 +835,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) ||