From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758225AbbLBXQW (ORCPT ); Wed, 2 Dec 2015 18:16:22 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:47870 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757843AbbLBWzV (ORCPT ); Wed, 2 Dec 2015 17:55:21 -0500 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Marek Vasut , Wolfgang Grandegger , netdev@vger.kernel.org, Marc Kleine-Budde , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 43/86] can: Use correct type in sizeof() in nla_put() Date: Wed, 2 Dec 2015 14:54:04 -0800 Message-Id: <1449096887-23017-44-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449096887-23017-1-git-send-email-kamal@canonical.com> References: <1449096887-23017-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.13.11-ckt31 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Vasut 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: Kamal Mostafa --- drivers/net/can/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 3230ac8..5932b17 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -730,7 +730,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) (priv->bittiming_const && 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) || -- 1.9.1