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: v3.2.74~28 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=78f78e5a5d77e95575059443ce3b9b3446e7398a can: Use correct type in sizeof() in nla_put() 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 [bwh: Backported to 3.2: - Keep using the old NLA_PUT macro - Adjust context] Signed-off-by: Ben Hutchings --- diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index db9100f32315..664263a2bf81 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -693,7 +693,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) NLA_PUT_U32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms); NLA_PUT(skb, IFLA_CAN_BITTIMING, sizeof(priv->bittiming), &priv->bittiming); - NLA_PUT(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock); + NLA_PUT(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock); if (priv->do_get_berr_counter && !priv->do_get_berr_counter(dev, &bec)) NLA_PUT(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec); if (priv->bittiming_const)