From patchwork Thu Nov 7 13:28:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinas Rasheed X-Patchwork-Id: 13866493 X-Patchwork-Delegate: kuba@kernel.org Received: from mx0a-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7D1B210188; Thu, 7 Nov 2024 13:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.148.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730986155; cv=none; b=ndkhPGnwp0B4/ODzouj5wO9obgcKPs/LkLPX5Kxr1F+eKMrGbEzr1U8x67BLnboKjJ/r2yPiAadxJ/jjNF6MjvxUnMyHTlVjGRAqMkwBTXfHYoi4rmeYuhcgt6+fYLKECuE/xE22vpS5z5dm41Ee/kfL8crqmlOsExU+QKbvapY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730986155; c=relaxed/simple; bh=hJX6GzCpMnmX/W7JampOKcb4yLv6v6EW/dkBQcKFFYs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CXDy+hmmZy7u17W/KSI33jM23lnpeqQIqwCBokQ4+lBKrnPqOZAW4+HewhPHeLCC9TVA7oF8fCCqa8KFrFXDq/d4UI+fhbMRcvLgGQKdIjAQhYtLSnB5P2HV6QTWZYSk4SfGfCTi75hLR+y5q6+ji6ostIGnX76wVZEj2ZVqeaI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=MbkcARmi; arc=none smtp.client-ip=67.231.148.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="MbkcARmi" Received: from pps.filterd (m0431384.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A7Ca6GY018136; Thu, 7 Nov 2024 05:29:00 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pfpt0220; bh=2 2AQ4pR6UT3V7C9SFR/ewGKApDb6QA8+Dr0xc0vsNoI=; b=MbkcARmix1GzBgQ2l E5mtdocAL+S1yuV7x6t3azU4RI/nk3DLgXtW94rXw/OT4fknMi52ozGhWMapf6HD bNeHiQeDNi6jgSw7mrPiWGboHJEAS6QpjKVEqNDBRKkPkRFbBEtVnYFL4uhAtDE5 l99ltg/p6ufppRH0bk1AWX/09DfRZKHg04WsVigZWfd3QWEdlkn6bDMDluAIo+g4 iUQw9sHhBmPHTBbewl/TYblvOQdztIozXvshUGpjT/3QOjyA7JNpseYKsG9d+FYi +G+xz9cHwG1JdY9iFcSBVpH/E/N6PmFSbHAJp2JDogieLyj7Ipip4n5C9N98a01l AIf2Q== Received: from dc6wp-exch02.marvell.com ([4.21.29.225]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 42rwpng3he-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 07 Nov 2024 05:29:00 -0800 (PST) Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 7 Nov 2024 05:28:59 -0800 Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 7 Nov 2024 05:28:59 -0800 Received: from ubuntu-PowerEdge-T110-II.sclab.marvell.com (unknown [10.106.27.86]) by maili.marvell.com (Postfix) with ESMTP id AF9313F708C; Thu, 7 Nov 2024 05:28:58 -0800 (PST) From: Shinas Rasheed To: , CC: , , , , , , , , , , Shinas Rasheed , Veerasenareddy Burru , Andrew Lunn , "David S. Miller" , "Eric Dumazet" , Jakub Kicinski , Paolo Abeni Subject: [PATCH net v2 2/7] octeon_ep: Fix null dereferences to IQ/OQ pointers Date: Thu, 7 Nov 2024 05:28:41 -0800 Message-ID: <20241107132846.1118835-3-srasheed@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241107132846.1118835-1-srasheed@marvell.com> References: <20241107132846.1118835-1-srasheed@marvell.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: nMu1jQ5AZUbksn7PYme6mLctttF22mTG X-Proofpoint-ORIG-GUID: nMu1jQ5AZUbksn7PYme6mLctttF22mTG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.687,Hydra:6.0.235,FMLib:17.0.607.475 definitions=2020-10-13_15,2020-10-13_02,2020-04-07_01 X-Patchwork-Delegate: kuba@kernel.org During unload, sometimes race scenarios are seen wherein the get stats callback proceeds to retrieve the IQ/OQ stats, but by then the IQ/OQ might have been already freed. Protect against such conditions by defensively checking if the IQ/OQ pointers are null before dereference. Signed-off-by: Shinas Rasheed --- V2: - Split from earlier patch into a separate patch - Added more context V2: https://lore.kernel.org/all/20241101103416.1064930-3-srasheed@marvell.com/ drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index ff72b796bd25..dc783c568e2c 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -1016,6 +1016,9 @@ static void octep_get_stats64(struct net_device *netdev, struct octep_iq *iq = oct->iq[q]; struct octep_oq *oq = oct->oq[q]; + if (!iq || !oq) + return; + tx_packets += iq->stats.instr_completed; tx_bytes += iq->stats.bytes_sent; rx_packets += oq->stats.packets;