From 9b97e335581983c3a835236e835322fd21897041 Mon Sep 17 00:00:00 2001 From: Sushil Singh Date: Mon, 6 Feb 2023 20:23:27 +0530 Subject: [PATCH] nvethernet: Fix cert c issues Issue: CERT EXP33-C - Using uninitialized value. Fix: Initialize variable before use Bug 3959323 Change-Id: Ia4dc3f58ef13c76305ce8242d38a1863986af193 Signed-off-by: Sushil Singh Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2853914 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 10 ++++++---- drivers/net/ethernet/nvidia/nvethernet/macsec.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 07af3788..38ef3b0c 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ +/* Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved */ #include #include @@ -126,7 +126,7 @@ static irqreturn_t ether_common_isr_thread(int irq, void *data) struct osi_core_priv_data *osi_core = pdata->osi_core; int ret = 0; int i; - struct epl_error_report_frame error_report; + struct epl_error_report_frame error_report = {0}; error_report.reporter_id = osi_core->hsi.reporter_id; error_report.timestamp = lower_32_bits(rdtsc()); @@ -3745,9 +3745,10 @@ static int ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) struct mii_ioctl_data *mii_data; if (!dev || !rq) { - dev_err(pdata->dev, "%s: Invalid arg\n", __func__); + pr_err("%s: Invalid arg\n", __func__); return -EINVAL; } + pdata = netdev_priv(dev); mii_data = if_mii(rq); @@ -3829,9 +3830,10 @@ static int ether_siocdevprivate(struct net_device *dev, struct ifreq *rq, struct mii_ioctl_data *mii_data; if (!dev || !rq) { - dev_err(pdata->dev, "%s: Invalid arg\n", __func__); + pr_err("%s: Invalid arg\n", __func__); return -EINVAL; } + pdata = netdev_priv(dev); mii_data = if_mii(rq); diff --git a/drivers/net/ethernet/nvidia/nvethernet/macsec.c b/drivers/net/ethernet/nvidia/nvethernet/macsec.c index c9293623..1ce2fee0 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/macsec.c +++ b/drivers/net/ethernet/nvidia/nvethernet/macsec.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ +/* Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved */ #ifdef MACSEC_SUPPORT #include "ether_linux.h" @@ -46,7 +46,7 @@ static irqreturn_t macsec_ns_isr_thread(int irq, void *data) struct osi_core_priv_data *osi_core = pdata->osi_core; int ret = 0; int i = 0; - struct epl_error_report_frame error_report; + struct epl_error_report_frame error_report = {0}; mutex_lock(&pdata->hsi_lock); if (osi_core->hsi.macsec_report_err) {