From patchwork Tue Mar 18 11:57:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 14020873 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2079.outbound.protection.outlook.com [40.107.241.79]) (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 7ADA520B21F for ; Tue, 18 Mar 2025 11:57:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.241.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299067; cv=fail; b=EaNPsELOUR3fkLf9BZ2H+AQbF/Aty5D3IaECoz7P3mkum7dBMvxr1PpPWqsJ8PcEt/n/X61CZFAHWdycsfrt0xnAlmKZkuzc1io3HjiACibgIn1nhu86B2pEtJY4BybDrDX46/TRpakY/NBO7kXWuq4KnxV1Iuc0BfD5/3ogID4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299067; c=relaxed/simple; bh=kItts/52Rpdt04yzwYO1LP5FV1eGeHy8zAoQdtRNOZ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=EYVuTa2kFJ+skor3s3FLyq2P2Q5+EKHfPe0Wqofblcb14NOblaxUi90DhsBfLoyfgNpWLTuFJix2I4/WlwLY1Tti1ce3MAlPg/fLjQjkMvwQK58HZYP0OUJOG88qKQnd9oWhsOkmEg6lTBH5vFqhnoHnFUHY6Y2zgOTLwo/YAYc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=SSaqyyzW; arc=fail smtp.client-ip=40.107.241.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="SSaqyyzW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hZlkcw5F9OUmx3srd4XR4qxSohzo7ejVN22tL5mfMbDpqcR7MhngqRIj063MCs6uAR93VofTmg9efSHc6Bcoq4FGxPrVzqCIBgwsm/wFMR2/t28l3eevaB00bYje/hNj02EexaY2HaRa1neV3ZJJ6wERFIaek1qaD6M6Q/rpFOKkoCvtjdZ2aQ5rgbWtCgbb5ljCgC5o2Txl1hdHYRSI4uN1HLXgGRv2tsUxSzhG5bbTpHe967ngIY+6oK4VnBvCOMM6d74lQFV74G1DrxBgmoPR0QON2LTRxPyBqF73S7wFkWJDv0EhCKir7CmkVXa4SHmH084TKtsmRLR7WvArZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NG0C8UoC+j1U8zlSa5RoZdopl2PYwtKg5+ht/Y2QJrE=; b=XWe+OCJ3e5OUWq/Oib5n+GUcTkNT34Fqp8xhm3KBz8AuUJcL4CjWLzP36Ndi5FKuigOL7D+M1vbkylUbB2TZafnVu3dx7HwcP5A5+sZylWmFmdnAI00UT0I8D1y4y1qlVu6+1T+StwJ6rCCZGYymfubpsjZ8bHQzDwFKJ3Yk15oARHuPcL2oNcZX2ZY31cBYkdzvujGp8c2MdzKHTW7ceuYkHG7POywGXGKkfyuEiFS3WwnXCPbajSUIGI8uClzT7jyWH8jsqtg2hWxaWoOwjK5ChMWn+R3F+eDWi1oWalzAjOU+w4umZPzCaLPKyQLBXz87UkXnT8Pcb9jT0kexiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NG0C8UoC+j1U8zlSa5RoZdopl2PYwtKg5+ht/Y2QJrE=; b=SSaqyyzWRRlK9OnbVnmEXSYpk4E2QaCEaL1vCiF9kKE5StjKhlWtj/ZkgJC1FGjd0t/wE8bqrSyC2asUq2eLC32MMFUlPDhmUbspoPZP6s+TNBa0aw5LT45qEYmmhLMQdrxbGuoC4UHAptlWgpU4HYI0Y8EF9La7x0TB9NaM3Fu43SBW4bryAGk7mg1H6R5PmQ5DeaDp8Snvo5HXPFKYw1V1k8lqgvjk7yykHYDjXbvpFNw+4Bg7dI9r+hrzelzzFO327i5skbAN3rtwUO0FeBN1ltpErFeB+LhupR2MgZoiWfK5W6DVMDfbltEVZGVVGuDPF68h9ROpRgH/oFIwnQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM8PR04MB7779.eurprd04.prod.outlook.com (2603:10a6:20b:24b::14) by AS4PR04MB9713.eurprd04.prod.outlook.com (2603:10a6:20b:4f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Tue, 18 Mar 2025 11:57:29 +0000 Received: from AM8PR04MB7779.eurprd04.prod.outlook.com ([fe80::7417:d17f:8d97:44d2]) by AM8PR04MB7779.eurprd04.prod.outlook.com ([fe80::7417:d17f:8d97:44d2%6]) with mapi id 15.20.8534.031; Tue, 18 Mar 2025 11:57:29 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Florian Fainelli Subject: [PATCH net 1/3] net: dsa: sja1105: fix displaced ethtool statistics counters Date: Tue, 18 Mar 2025 13:57:14 +0200 Message-Id: <20250318115716.2124395-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250318115716.2124395-1-vladimir.oltean@nxp.com> References: <20250318115716.2124395-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: WA2P291CA0042.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1f::14) To AM8PR04MB7779.eurprd04.prod.outlook.com (2603:10a6:20b:24b::14) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8PR04MB7779:EE_|AS4PR04MB9713:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ed25909-1702-442d-972e-08dd66140eff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: /TUnEYI++Md5YzjHk0JAMfSLAGKvFCer1iGJYgFWrwac1vTaXQayWfAWCJfVpeYPgVmzqdYyvgzbtxClVMinaHA34UhFo83eFxG4iSSFSoxIPD7SbCRuLioPyY0l6GbD7ZgVBI7yjrMHl+mM3Llra/M7oHwWcxzHJeRwhxbIvM/RFxZcFiitMaIAznyHRdfGpde9UZdYpvp4c1pQO+s4E1y93b9d9JJ+zgY3S7PopDCo8dKqmdyQkoJ8IA7b4lF4NyAhKDBGbXHfBdG80w0H3Q9cALQpQjMKeL1gyphlya6YbCcOvLAQWm1Tkk4nbVUbLEpUru1krjzpCW5Z1btPIsi/L0cTE9gtNxPWhCLPgxTV+vAqO5rlVbeMoOAuUqFhzGF0BC1kvTfJNmsN6tKNYVcA8Qs6E7pPQMUNWgco/8eIkPTM6m/9yyeWFiDIZI2VlqwxNhmh1Hi131pwMZtHWXE9IcS+yzLzKgy2Nn+qlJf1fb7x+tr4FPXnDCZwsvRVR9Gp4ddjFuXugT6F3+VuDQKkkyLR4GsawK5rb70GmThoEnnEgqXE7zGDXV5+/qe55Y4t7AtH+c38f4MoUPoASstHJw3ThnN45DHuTkqIZS2oDrxmvFbm0YEYv6PKTcVGpQviJ/KVwVN44NN1om+ry2nEEzjJGnNec/XSddk+zroi5icLhqc0peMH97SYatGBJMzJ8I1kdOGC2RQQ/SdxJSHlMrDWeFOG2kAKFDKqgf17xerc8KbBOz7b/qEHuYUzCBTyW+Qo6oqU3dDu6dGZSw8axAmmmgR+WPePDpz9j1+R7JLTPIfAcx/Uh6BygfVcoX8PuE4eSyyJkaxXFlTJVk/JzOQ2gSmlz43cI55u7rvcmncGn3zABLlBXYAKxNnuou7MS1x6nfJoXfU2lKqmyOVZ0VxH+EVTnLMRiP1QaQdx0oATtWlU0smVa7zaq4Ot5nuUquiwgRCdCd9mqDE8+Wb5+YafjAl653UpFRL18HLVOUe0Kc29Z6ZwE36EKQnvohIKIuPPXSl2zjcGmIchGTIQSYkFrnechm4mAHR/K1nds55jw+ACU4wJJholax6DUvvT4NwgkFjpF6Y7CYDf721cESe07zpqt3Z5EOLuWS799oiuEIs3ahOzrQNrPyTR9Z7XpSoey7+Dmklhx/V4YghqeZ5N+n9yq5wq2fMG0isYot3O2VrzSbJ7FhyuCifb3qVkaYJwHaRO9RguHDBXZb5JdrPoohos2LJaXOOWasforO7bIo1B/m+uCRl+7pXw1Ru9rIahdTUCH7qhkp/TtIgmZCpYI1JPa8iHCTHfUflRUJ3CuIRuHREYING6NRJPBTo0FuiKRh/T514a1FRlvsUHh4Kx0ROJjrbde8axG+D7KjoIfBx7p7+E2vKcUaAetcD6DPv77WlS6qzwzUEl/uA1fWyP1ZW05iuVmU0PMM+Mh7uzOS9Avb6QBiWhqGag X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR04MB7779.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kq5ZhjZ2hTY/nx7G68nVf6wDZJGvkUmDtWDofBgT2uon89j1gDFO9RRzneMRMVPmR4Cf08ukloo61SBw20bdpAPznW6FkRpoTAn5VTVxs87ONZMoEVRmkcQo/OZK1nhusrN5xmKkva88SXGd0kjO1Ih/XG6BkKucTY6UEjr1B2jgU9xv4faMsxaScgeBMJHzoAglgXfHsR7TsNRANd6i8U/3FKr8RdVIi5BIFgns/pL7+M3bpyeNP1lPj5JJ6HT8gUkx+XDURT/HsE+UCNq0VJmoQQAz/38iYc5fzt6XQmsXvFeUX8gix5H1Dyddsrnzo9Lg+MhetK4DIYRP3Jp+GNcBEsXg+aaqAQ3lM4clPrOLnFYZq4ueSl3Y8ERtzB+5we+b1Ov2TTlsQ8BwUToekPkNEMcl4O1B0TnsXUhqoyk2OoOflEjeL4I7W7o1RXJF4DH6xkiXJKcOPDLWFPkceDYuhjZwv34aPfgpZPnVRi+ktctnbbklG4fi9gDwirBz/4oihfBHNaNFWl1HWM9qiJL2ronMC+0YQGCMNZpBuQ8mmZd6WP1vhSW5ry9iyT7w7wWCKkCunp5c+Ge2jxylPFnautu4rooh7gXrAystQ7Q/RAXvu3hLAyqnS9eTwOIxNr5WzBbpHh7n5h8BO6PX1Ov+6FoTKDCQFBUXpvAwD6GFhzUSi6MrAtIyDw4Lx4bz2sgpCLf3pcxhv/BXuk+31lt64pihs/RpJzyTeu+m9q2gMScdi1nfKFgPdeELfT+Foz+4iFHwb38F7bPr/0PIHpCvqhkiBYlzEMSyaEErKCzzdzA8kRflR6nlvQN39bMCi4yIt10mttxZVJj0XrPDVx6m6eZRSg4/PD1Znl930GPGwfkDg5Dj462Ti8bZW8kepP/4EwEyMN27XWZx2vUFFS8b0TkEPLldImvmQfnNt4GISVrxQwWk4kfR121VINb5Tnsgbfa0dDIOpUwNI4Ph26T9AAwKQFye6Xg2YZEwBQEHa4fjm6yMsQLLpV+SuIOMQoRgGSu9naft8M0FBqzSSK3990ePNt7G9Gvbo64RLSY9bztR55lhensGKz43Orr4nsKp9c6t6vQ5rOirQeUkFmNQ1YCoOQcwdK2svYSVxr3KQvfagnveLjfq7FAU5ekVKirjnWivGQE8/pNDEsFqM8VTL3fk9PCu2bDs3WNehb8NcERUgFAvM/lBlGMTJA2ZsHvw/WRNDni6q0+GBhHqtzubZFNf7koq0loKsxIwPH0nnK6RChIifRyc+q1g848CPPmP+V0vvIBVoJipnJpzCRX76yLTvjrRcduHv+Q3PN5s/+uvDk8qNFDPYzOjPozpfs/eirI1uGfOjictI8iS6SCwoH+ql6yWtORYyBoM7KTgDx+IYUmwHhzPFzlj7VAYlPwKobeXciLiiTaTQfBhfPvLLOKs0DQKAQSzNyJrQ09FAcxwVCIWhvaLfjzaum3IlXwbLFhlp+ntwv2ZchEiAvZSEY2YGzgKgUUA+9oAXagSK/UtKHdpYqSNMTWbojtdRJnU+zJCSpE9K1WPYmjD95dm1v2Ec9yVLfvEXXBPCdO7byOrsRcIxgsQzBcRrGV3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ed25909-1702-442d-972e-08dd66140eff X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7779.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2025 11:57:29.5766 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w6QDccZ+HXAH+eh2hx+Vc1KbJ5fMvKr1KOD5sr6xVJ0fzgBLlR61de0zUn1lSCaKIqTOfnkIptOAKXENVp0MUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9713 X-Patchwork-Delegate: kuba@kernel.org Port counters with no name (aka sja1105_port_counters[__SJA1105_COUNTER_UNUSED]) are skipped when reporting sja1105_get_sset_count(), but are not skipped during sja1105_get_strings() and sja1105_get_ethtool_stats(). As a consequence, the first reported counter has an empty name and a bogus value (reads from area 0, aka MAC, from offset 0, bits start:end 0:0). Also, the last counter (N_NOT_REACH on E/T, N_RX_BCAST on P/Q/R/S) gets pushed out of the statistics counters that get shown. Skip __SJA1105_COUNTER_UNUSED consistently, so that the bogus counter with an empty name disappears, and in its place appears a valid counter. Fixes: 039b167d68a3 ("net: dsa: sja1105: don't use burst SPI reads for port statistics") Signed-off-by: Vladimir Oltean --- drivers/net/dsa/sja1105/sja1105_ethtool.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c index 2ea64b1d026d..84d7d3f66bd0 100644 --- a/drivers/net/dsa/sja1105/sja1105_ethtool.c +++ b/drivers/net/dsa/sja1105/sja1105_ethtool.c @@ -571,6 +571,9 @@ void sja1105_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data) max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER; for (i = 0; i < max_ctr; i++) { + if (!strlen(sja1105_port_counters[i].name)) + continue; + rc = sja1105_port_counter_read(priv, port, i, &data[k++]); if (rc) { dev_err(ds->dev, @@ -596,8 +599,12 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, else max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER; - for (i = 0; i < max_ctr; i++) + for (i = 0; i < max_ctr; i++) { + if (!strlen(sja1105_port_counters[i].name)) + continue; + ethtool_puts(&data, sja1105_port_counters[i].name); + } } int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset) From patchwork Tue Mar 18 11:57:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 14020872 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2079.outbound.protection.outlook.com [40.107.241.79]) (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 928A720B7F9 for ; Tue, 18 Mar 2025 11:57:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.241.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299065; cv=fail; b=nvYGKMPwbBylN4d3C0WLN/3TlABUtuRiJwsNY+sVZ18q44/Zzs942s73XzZB370T4ayATF7WQ0k7D2JzdJie5vBNAI2LiZjKZcPjMhNZaKyVDI+Jl6kktq+u+Xj4XZwGl9JvCjmrrYEvzESkvVpGqeKnFq1qtFdQA9Wbgw89nsY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299065; c=relaxed/simple; bh=VAP2Rjh/IleurhkLwsM5WNCbzefJxetcYQv3rbquX8E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=lB3czGBLJzWo0i5ZCMbMJD12x2Pi6cuntthlZHVkm6lsBtBNE5Eh2vV+85+JJ0WALdGgKapBew8JrQ2TZWKmXCJTLVh0rOeHAZnudYHgnBdlh7HC9MvtOaGr1eoxvJrTP1l4BGw9l6RydtGXtYX7yGlODvUMhxRqtOhQ4WYiaag= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=bxzIlhVY; arc=fail smtp.client-ip=40.107.241.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="bxzIlhVY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gJJgPX8G1S4S/tjJTmeQuBiLukjVaG0PPp+I6WraSz7RCfkfQKqpohKq5m6m/zWHY7OgyTRUUw3uIEW4AnOf1O86lj0rQ2FIVa5iCunkPTV18eyWwxtnVwN51V7U+WTmUhCkvMpCqTZjqxPPR0Uy3KPf6Sq5MEEpGmTAhrwxz7UvYoG0L0UsbewdVqwdQoB70PGkPDcSAq7Zc41DbmpWpjHR+CtLJZfZyJjGFjp9TPy3vMwsVsRdDX63FzoiwfbpEQ74x50O/654k7/NvbkYAbsfiDZMUFU+NPRWLjrNkzTTFggeBO5U0EcB1No594BmRa/CNXNwnQPPzsAAXFjp6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cU9e8GWltM7STQJLBo1NbWINNWFPwZK60zmmuOEiR/g=; b=kinUCetvT4hCnRUepPuuqCmv34MJnwKadVZ8LjqV6wS1emkejhjDYFFTmLxejA8PNx9N4khr4zdllZza8Ycro5foKDugNo93wZxaep5LkItlTcNKBf0D6VPO/DCuOMlSLo6+6kWF9b5wJearJi1uNxxvFjkdz93gJFj8qXlm8y4CyGxW3KCaUz1RYTrBUdXV32HRg2+xm8srFr573eSd8ZoaNb6eg8hzPFCikjnuqRPnov6ZTHL43B2PHVlWFTRFNDt0X+/iWAhcz2IaE4iUDuUyCs5hGD3bPG8DRB/RyXcYlBLURdyIoHTUyPP2JQusLxgFFVI6s83UjP83SkLn5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cU9e8GWltM7STQJLBo1NbWINNWFPwZK60zmmuOEiR/g=; b=bxzIlhVYQcM0qwaMKVF4viRPoWaHJvsD4qIZZyJho+mAVPifmNi/tpKQiKR/iLHC1dKOMKvaDwzhMQprr5in7OsFouTKpPqabXUlrwMHjh9WZIyrpGFAXv4lsg56AqU4ulZ/nN6gIQDtSYtIuY7U1V4qJr8NhGDwiJonuF7v2yrd94ORBYgkDOw/S7OLP8JC2iZqoUs36TZIJ7YiL65j2UX/pApcHrhqZX3nW/kkISlpTp2qU06vxAw4kJnH3DnD4ugX3osyjjEtQDGBPgpssU2y3t3KB4Nfqfsnu5qZBT4iMxUeSfCaezM0vIEmgcHdxZrL/jtlv7c5wiDwNSmtRg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM8PR04MB7779.eurprd04.prod.outlook.com (2603:10a6:20b:24b::14) by AS4PR04MB9713.eurprd04.prod.outlook.com (2603:10a6:20b:4f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Tue, 18 Mar 2025 11:57:31 +0000 Received: from AM8PR04MB7779.eurprd04.prod.outlook.com ([fe80::7417:d17f:8d97:44d2]) by AM8PR04MB7779.eurprd04.prod.outlook.com ([fe80::7417:d17f:8d97:44d2%6]) with mapi id 15.20.8534.031; Tue, 18 Mar 2025 11:57:30 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Florian Fainelli Subject: [PATCH net 2/3] net: dsa: sja1105: reject other RX filters than HWTSTAMP_FILTER_PTP_V2_L2_EVENT Date: Tue, 18 Mar 2025 13:57:15 +0200 Message-Id: <20250318115716.2124395-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250318115716.2124395-1-vladimir.oltean@nxp.com> References: <20250318115716.2124395-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: WA2P291CA0042.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1f::14) To AM8PR04MB7779.eurprd04.prod.outlook.com (2603:10a6:20b:24b::14) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8PR04MB7779:EE_|AS4PR04MB9713:EE_ X-MS-Office365-Filtering-Correlation-Id: 76d6b636-dcfb-4fa3-b4f1-08dd66140fd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: PVbpDZ2eWQhknMGOvKbDBASqaY0AroZKSuDkyUf5Jd+mnfEMrO28A233rnV3gaeoJSd9HkAjHzGB2UZDTEVYAgn4hsYpnTL0BfNLlm+TQWHfKVRySpXORtTdd/xivcxT8LeBc4ruffKcdLK+nVBrzvxUrfyyUW3fpId23RDaLJmEgbAW8JPTfAQpAczz3GhmYfBtMYdcFJ9EclNklY/nKH6YtLnI0XIzvwvi/+e8YOfms6hYfKnR2Ed4eTNUGgrzL12pcLBX6dD5v7JfGsKCRxuI0KaV+nwrcAN/qItjedPvRrKD8mT5lYfCmUhIHsELqRAx81xSnmJcOtllBPz2vWKE9OT+cRnKnOYKhm1VL7n4/IWyzjNUW99NrVkP7xlgT3OisP8HH3UuFY7YKEMLyLOorKV7saF6VL+/suL45pv9C8Wl8WmrE0X/l+XdHF9buOQnQb9rYhieHsV9mZV1qdobU3En4q3dtj86sLuwcqcacL3Dt/JFu0+5DtT1AWa+Js7oWE3RRXu8/K8vAfwFQXZ4JFzxizUdFm7QFFuJ9YscJ1vHg9B3v6LjoERVlXpn12dszvpWlKCGT8lZf4TtU+BBYgRyWIVXVevbtp2O1P9rVZuofq5NUeb1vRLkQpmKbb53NxaP3gBgZKXLEJxrLTHPJpeKXBjWvKU7Y9mjgpmGjSxbUfKjExVQ24TgF7RbJuQajqL5wUNEima9rwQo+KI/y1lGfBIU+RCFIuTWibADDX3Pv8zRfZnUWUexXb8WAx+zrbh/8j+R90eQGyP2etOFP59W1ASA7LWevIB82kJngc4uPJJEX/bXqVstLyCpOn92ILvuOF1qVCTJkAFwXkdzQM8cR68tUrEwvaY6wtmP+wfIzD09zysZZEo2YBr/X8H48M5HQnvcvjkMmQxggPOAPT6QLTVo6uE03aXvEEYT5JW1gI0fZcHRPxGqi8OHqhjRF6CPAX25ERJNeBVzKDHy7HndgMr13OiMZquiAN0KcJLxqA1a5c4q+K8bXvcTNQ71mm4qmQR4dz2X68UeslcJZnfwMH9rd9Tf2HqLViBhPGKe9fUXkxYidRXObYJl3dsIUnD8pmoLNxxkgTg5AJEL0XemL3IB8o4nac2eaQ0RTxIhGn2H9M+d4to+Z+ttRV2Cr30foSxN4exmjCrnPR+QFsJtt+8Rhcfzh/cMvJUSv5tGueBg8L9lGVnVbvXEI9ULq5TgPelH/VUjKijyDeeTnVAQLvSeslr8mNrukYIBsag8/eZ8+c/5oSfBAzBhcqa60QHOzf+QQ656I0k6fKWsvaIgU9DS9rP4tyEyW6iwN3m3B6aRNHlXVgGgtlhLro6sPf6AXsi6CPKN4ziUcJa25d3EB6GoEwEbbyzgGdsdGQRZTuf5tpiZGKjbzm9Pg6ceYzpcZ9VqUammBynyRuIdIAY9mjeFxMfpMrZUMCN4jatn7AxVVz3d+47YcxrO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR04MB7779.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PeW7OCKv3i16IAf2gMyqZigjJPZ9cJ7s/R1E/FbT66eqsYlPT4rg+j3aclxjoSCXJlrZSUK76UTQF/cYn4Zgr5WPF2i0RztIgJ6qt/tzijbAICdQbfKy/GbVFC9getPwyg54Zq5vXwA1OhxmREPx43FGT8nwgdPfecjz55iDjavjNtUm5PzXkRDzDt6BaYSJhIyvP4G1+PjqJ15JbCG4Ya6t7MFqi77aW3Zgt5tiVbmwoF5zDXNAdBD/+IHhs/RSaDy/CcJ9CVQmyXAB0IZrr0m2acJUZjXa67lJ0jI54vGjsb4Npxer+4BlppH8IuQqEq3erdwrhJgF84Kw02owzUfN8J5qMBOJR71Hl4pCcLAO8D+sj2xdyrXVT3dO+oyFNj+rIGAnndyIhbVjnb5l65wH8ViCXBqmlL0hxnH/OaFpLP8aWDcvhuZjZDGaoEbsYpI78iGi9UzHE6PwcSU3e20VPGBkZNstLzTwWJsWr8KSWwN8aw8o1QXR3NVXryIxaMQ0GRJ+xMadWL/XS8EC4kSZmB5fQ7q1DxZH+ePZ4+EO2dhCw3aSKt5SZTm8wD4hfBhTvBF8ePuaYZHVTqxcgMdhbcE5Nkz0R1EGRbFWH0dXr78lP4VSfH0cx7pU4vzdmc/5vhMkc8qerrkzFlQtb1KDTHmJKmv3yWDLOxv3N7N1Qv0o766HSnCf1Ymz6izpiY/seZV/OPDkj95oZZYP302b0ndq0aoHf+nqCFUhqmnlUKGhfaK/cOEu3gHNY4zIgHZKcltE5P29vbgQTtAjUTAY1bwmxUECbsMkY7p37USNtJP3gf2IRnf0rwKUFFG3TVCe4aq7eWDx3++lOKqjBtlhUyF4rbJ3X3OBcpWVWJ0JOzodZ+yjvscCIoClDdhfv7OwKRMrYUiBjG1d2nAqrhmfKMysqjNpaCOUbmaRqO/R745eU2y0SgxSPEnPDYDLhsn8RboWcM4DGu4w/u5B7KAaoCrmCeMCe8EbaMiHyKT103s7XuWS+8PI/Yu8BOgeleL6I2Z8lCCi2ssQtHtf1rb5hVNbvU4D3z7DshJBYVDBHSQkWvseYj7YHjRlYJpoyNhjYABWxXOCKTw8hZ0JxtgO86+6/4ERrLDVv26iAObXu5sQTzAkkxJXc08Gi5IlBvZwnPkQ7JjuHp3nkV7G9XynyXYS/tHPf3Q4xlj+atrdB4GzRNLtSNmzAJYJjfenePJwnWgVfNJuXFWFMRxaxl6vj9/NQiKefKwOuv3GIXszW4Umbte85+t5W3atVLivzFoTWtZUAd0cSGkfn+bmvDAraODLPv0AJ4Ri7LkjQVDbfbHRdlt19xZwZxrXRtD9SZNBUpEr4QyyP6+JooTddV2wa7oYQuCyhZNLJllyI8IW7/MNViwfDxFuzbbNW6K7P70I645rhcv3PfrLlIxcIzl7T45PUmFajGxsX2vdvDRfWb8li0EEijbV1gJMOegPuSBCmKGSiDmmXXeg6xfzNlZrxIXokMK0kSMOGR5La37pVjDe6KLOaIhX3Mf6uH6RYQ0jOIfWQqgxkAcA5JE75SncecdPbq6tnqJHDX3M+OyZT+zmlB3Wfs4ziSH6KzjZ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76d6b636-dcfb-4fa3-b4f1-08dd66140fd4 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7779.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2025 11:57:30.9358 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: J8k2/y+MTKnKF8nJFPGNt1P69ypAK4xi9bK7eSilFuNk5/49zuyFoHBwXfRimVsKBJNlrkJXdHJTPCn2987TbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9713 X-Patchwork-Delegate: kuba@kernel.org This is all that we can support timestamping, so we shouldn't accept anything else. Also see sja1105_hwtstamp_get(). To avoid erroring out in an inconsistent state, operate on copies of priv->hwts_rx_en and priv->hwts_tx_en, and write them back when nothing else can fail anymore. Fixes: a602afd200f5 ("net: dsa: sja1105: Expose PTP timestamping ioctls to userspace") Signed-off-by: Vladimir Oltean --- drivers/net/dsa/sja1105/sja1105_ptp.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c index a1f4ca6ad888..08b45fdd1d24 100644 --- a/drivers/net/dsa/sja1105/sja1105_ptp.c +++ b/drivers/net/dsa/sja1105/sja1105_ptp.c @@ -61,17 +61,21 @@ enum sja1105_ptp_clk_mode { int sja1105_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr) { struct sja1105_private *priv = ds->priv; + unsigned long hwts_tx_en, hwts_rx_en; struct hwtstamp_config config; if (copy_from_user(&config, ifr->ifr_data, sizeof(config))) return -EFAULT; + hwts_tx_en = priv->hwts_tx_en; + hwts_rx_en = priv->hwts_rx_en; + switch (config.tx_type) { case HWTSTAMP_TX_OFF: - priv->hwts_tx_en &= ~BIT(port); + hwts_tx_en &= ~BIT(port); break; case HWTSTAMP_TX_ON: - priv->hwts_tx_en |= BIT(port); + hwts_tx_en |= BIT(port); break; default: return -ERANGE; @@ -79,15 +83,21 @@ int sja1105_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr) switch (config.rx_filter) { case HWTSTAMP_FILTER_NONE: - priv->hwts_rx_en &= ~BIT(port); + hwts_rx_en &= ~BIT(port); break; - default: - priv->hwts_rx_en |= BIT(port); + case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: + hwts_rx_en |= BIT(port); break; + default: + return -ERANGE; } if (copy_to_user(ifr->ifr_data, &config, sizeof(config))) return -EFAULT; + + priv->hwts_tx_en = hwts_tx_en; + priv->hwts_rx_en = hwts_rx_en; + return 0; } From patchwork Tue Mar 18 11:57:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 14020871 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2084.outbound.protection.outlook.com [40.107.103.84]) (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 1ECBF20AF77 for ; Tue, 18 Mar 2025 11:57:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.103.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299060; cv=fail; b=lBjE1TtIUYT96zelUpyMTYPw1SzgvbCtOW17pquNCb7oEUuGITUK+Bb/vBuUujIuCLZnc5CXYheA4z1gJ9kWy+2+/bX77oUw992rLtKWozROXH895gh77t/MAc0RyYGMGI5Wkv1AkyfVUCV1Eveo95/fkBQZMpW8c8MO5YQxZK8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299060; c=relaxed/simple; bh=+IYw6H5CCWA12wAgSxIDjoIWYFv3BvmB/JoH1BMyYmY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=p0JxmhHJOoA5troYhTDKP/RAWdrXErUZY2/yaNPkEsWvbDTtXgm9NqK0CpF2Ltri4+Lzx0idgZvrNnT6+haTxAKilWUVisTTRyjFbEDJ0zYIU4pWH9y1NT+/1hD3ekKRBv2SxsSrpmcGYhJ8ZuBHT9TLFl77Ny6hq2Da2UVJYdE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=iiCrhLY7; arc=fail smtp.client-ip=40.107.103.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="iiCrhLY7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N1nqVh7Wd2wsMVOZUCBoErwq3VumE4RA2IDEsEc5a+4PZDxt7juLQZ0l5Bsh9mBGpzCqRdX00e5bXPqDmq3/rHBUHj5T/0Q4gb6TTTcBOVLxzCuYQXaVkRY6xQ7WtOqu37FgmW0eC+Y4an7KbBH6nDdUrmm5J2TPr/bp261TTgW6v7w413Sck6Z/3EHf3XYDbfBObmrufSe7ZOqNiGcGbxrT+u7XlanZPfss9rsBvX4kyKBHEcoDRQ8j/f4MWVf10VzoVUGswerdGPhOEzIuz+TbyXLK/zE7BUVBkHG/0N/uuYZ/uyHzrrR1A4FT+0jpUWTk8UlumdI2KEbkCzgqVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lE8MuB4UAo6Urji1B/Oconyn6h8YV7extukzH5qNGoc=; b=IDvyiMUtX4mOCSvNkCOrMf0klCPD8jENkNqPUoJ7FM4hs2+ipWbxoOBDrAxhCWSyXniXR7BuirYS4ydc0VWHeShaGskUduGXRj+sn8ROwgwpQifjyBthgEGerbk6RUadBNZBFqHUA6HSm7+PWPOGZTOea3i5H1qFLH9dUxqgf2On9d1dQOf6qAShnYxyagOeTa7OAcmk1fhvZrVu49e0Y+KWhZTryS1L9p9ACrTAnPQXTu44APGI2ZOS6Y37dHJsx+mRkA/IYzLYNHkj0r68o1uvuMmaS56ObvABYcu5kIY/XR9MZIDFCQosU3gnf89xruuJXNKrQt90XYHVuXgY7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lE8MuB4UAo6Urji1B/Oconyn6h8YV7extukzH5qNGoc=; b=iiCrhLY72oeVte40psrwBix9FInTo60ktbDBvuNNxdH4VrCkL8Zywjz3WkczUdHGBBEny950nItIkktIN91TvNTEeNHkG2svVm7vQCsENkZjyEHBq9KqGIbmXimlF/NB4Gq2ewybxIkdsSPwQ5qHI0jIro13wU3Eghjkmh/WhHuJP/FtijJ7miUUcXCeIsnuvj6DsGbgqlV7qlYGK3v7jWfqZIDfrJ15G5XciNkOgpDi173fp18h13SvPTlqYRE5qDUoPbzLkNVdfVQfe+SsYzhyieAg2nyOQ1zTT7ElnnApoT4x124Y3Zg8/JKYoqFkiL8a4Ov8qjw/GT4dnnv8CA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM8PR04MB7779.eurprd04.prod.outlook.com (2603:10a6:20b:24b::14) by VI1PR04MB6926.eurprd04.prod.outlook.com (2603:10a6:803:133::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Tue, 18 Mar 2025 11:57:32 +0000 Received: from AM8PR04MB7779.eurprd04.prod.outlook.com ([fe80::7417:d17f:8d97:44d2]) by AM8PR04MB7779.eurprd04.prod.outlook.com ([fe80::7417:d17f:8d97:44d2%6]) with mapi id 15.20.8534.031; Tue, 18 Mar 2025 11:57:32 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Florian Fainelli Subject: [PATCH net 3/3] net: dsa: sja1105: fix kasan out-of-bounds warning in sja1105_table_delete_entry() Date: Tue, 18 Mar 2025 13:57:16 +0200 Message-Id: <20250318115716.2124395-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250318115716.2124395-1-vladimir.oltean@nxp.com> References: <20250318115716.2124395-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: WA2P291CA0042.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1f::14) To AM8PR04MB7779.eurprd04.prod.outlook.com (2603:10a6:20b:24b::14) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM8PR04MB7779:EE_|VI1PR04MB6926:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d760e2d-1f9f-4e57-18b8-08dd661410a3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: Qw1itP7O7unubQDxg1y4gWWC5kFspQmWFWMaMAhlViJareIhnj/jyQGen8FkeHmFeILh07HgvD74tZSkmmuFTZR2W8M5SrF3TpXnGDDxIyKA8s/AIDPKvaswGyoXePpAhvgns6a00iWYsQ7tRbKA86JYAm5UzwThCjsaT/Tl1FkpAWXr4AIaeXfzLfZ60WOWkKL85Jbh6pxEGW2bxToEfjs+hVM4ucBCtj0iWbWKniQAe7sj6a5mGs2gjRo1quVyhunVv1i7cUChRJpflu9tFC/AMmjlQuF6CTJKsjowo/o5I/K7q7y/YKD7XPzX8GZf0NjTb/Y+sEcfdXtMytlWghNZ1gtHv5toVZ42JPsJKIacKBUCbqlJxaWtP0056+Qiuc56/w1PB4iGASNbYj5JIiDJYxhXZ1rjHPt+nY8qbtRfWQQU+VJ3BUT9/p2ZvBuXX+o6Zq0DBaM9do/JOfkQ4llCxYVC69M7gt4DjtzxR30qypO4eJTAh7kQg+VXACdK4HFTNDjvpkLFJeyEiyPQJqFsiZvdYFIlQVRZ59UvTMSIzovhuyJf6bqI2gveD6ocChmL+quQJ5rrBgvJqOPYLhpJA00w0K3FFvLLVUpHwEZCIpFJsRpj127hjQg4Fp08htxb5fIs8ZB2i7zez+zU6nvU+HSTYjcgxdtYZNY2m34yCUzWeG6f8nKKyCpcO05LF9bKt7pzYGPtZiQA5Sw28Xfa5qiNerHOmlQc2OPhwZfLWqDpCBw1U2ybqIusDdHr6ly9xFXAAdOsoaeqEk/gnT+UwWd59xLAYEwczcTBwNzkCRwr3omTNM35oD7tthSk6W/RIw61NRU0juuIHEUd4/dfZ4AjlmkWAqzv2UA+jTcQNAHZF4XjZ+X/8dr/D3dV4A9Edkj/KR5CDqeYx84U67lzMe10rtFYcjdtsYMVnGwAoo/SsQtoQPv+M9uEK22ZDh5tiEGsH8wjVForxIFKBgsXKXqK7r6ifM9s2bAizb5FxkRRDv2dAIhcgIks3RAWHdm/BPip0/7OALP6xA57o/bZcuQtH0ccvlEPJ3IJs7WEvtGnfn7Yu4zKgOht0GssnDWb36ZAsFTYuHONK6y7nIpUibMPErVLP2vu1WiCeWuRw7Fa0L1qPWgvNbprBP5mT0TVgptUPrGfCmSBHmWGZRZu3CoLpkJLk9vBDc97Qyu0ioxyKMoUXybUgJvfNtB/ouDAQ/vrFfDI5UT5//OOpzojIMNPQkSAvcZ88VBVTuwgAqKdu3cR7HgbAkm/coLZjRRrZO21YHN7glVROHfS9hOr2GwTCN3+11pK2OjDQrKMngvzfk3y47aLxLL0OOrtkHaJBeEfmsnzudeHNCzU0uGGfzCwsj6+M5UVsdop5HiquuuONGya6RyKA3i1IiZMr+VCKG3uZRcDo2giQv3I7iOLGZ8WRHsfRfUiU4xxl9UySM/ozUZWfgNrG7EV+MZ8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR04MB7779.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Kklies/1/FJMnN1Y9+7vvmn0Whpu2bqvVMnzibeI6zDc3pAVVWNLXccNF+jf6MKt95NE66XeJkELvbidm0TWjol1zh2Nnxl5lXfR+WsYH6qgQ2MZVtN0eQEqpKcL2XxROUf7STfkz4r9L4Hs9U6fbh43hp8KPKwcoN3WuAv/MFzjy+jGpkAN/qsZzlF1NQ/UFXkWIn8sc/vfJVTnJPc9VjXJJujBumspv77byTO3gTdSW1t8lsXcfQgQfvz+TS7QVNfPyEudNlnycSuYBj3fYPFLsIS8TxQbrq/CRp8jI35Hv0Slo8UNfgvu3QDCXn5Gw+1LDBT2Y7QgTaNm52OcMNz3ttA71Bai23PGeu5ycE54YmySRAqVIDWwvHw1si5a1516Xw0fH0DdC40zUgq7HbVyrUqoIkXx9FKiOpDNrTPyi5R/KFk+FbMoPRwwlsro2SEPe6SEhHCIzmc6d5fjfjdGtx5mWqzkXuvoQzsCYO8/xKw1jWmgDgmvNrGPoGkODn6avdYAlmN/fhFOR2p072Jqks3Sp2YBI8ijOEuknNZii3//AtyLUlfeN6rLi/2U+U3XNNpMfxSoyy8N3E9TR/GCtANj2Seb5T8BFXSZU+Lv37XFaswA/02poYPqI4YZSr8rFvTVFMfbUQiFirirNHua91ZX9mGa1HYRMOsWccn/SdzXmLXg483KsxVA9FPqSxswvhXtl7v7p5VJ1/qelv4gIy/w76mKNVVeHGEuMhHQ+ifXqqAXPsZfzvl4QOVB4QssTVcy68+/egYvadWvwq76kjQL1r2wCMtWqlZn2lgyWY02PszPMVBxxtwCpwYBb6XdD6BhYj0p2vhpIe1LoxBkmw4kd4cYJ1LYDKelBGTmwKkcJSMbPoY3cnakw70frkCpd6R/12UwobNlqR0pFzpwGmhzXncau8TLKFsC/qQ7ZBXdOLVsvAGAShWIwQFylkV4BWjn2L3/kfddEwiw/XGck8Vb+ydn1s/kxOvxYD4YrGzM43UfqbcZSN3LRn6SDTkoFNZAVbH9pMOqfywj1WeYQTJDIdC0f2Nh/i9vzmK5xIEDDl8vaOvrg5JuK+eWI/GF9VECxoJuLbh/2JGQAjP65rLgJQt6018/sH+Ti85A29PMYdxsNmYHE0RIEIJ46x/wigQLgzo2+eSV00vZTFzagSQ+RJO8M3sQRP+hoNB8gmo6eEHnWjE5SkgbEsOnNHQf2W0fTgsBlmUbZuD1u9fOj6zf9bbJVyeMZT/Kxx3k2oYkPgP9OsBOeKeGFaaa6vcohOVPeMK2QzxLoHV1sbONxqqjo2Pc64pR57u/PWv0ticOVEmuFAEdPoCH+t0B/82qxKaW2geO7A7amqrDigrHUnYDdSs24U/fd8m4Pw6a7Yx3ueMyNV0A2VoXQA75z3fP4I275BrKZ1WXy008kzIAN2IFfjK5W1/+Vbj9JnA/d6Pf7b+N0mtN4KoaG1wqfboHPVRK9zYw221TgJ35WSPDV2hKYlzizt9Ntrdc/jmy8RrhvRy/QWUTxP3jELjzJQ41K2G2R5+idJ9xNOf/JXXoT42KO8YhPJoNXtYBbgCxWk3PdL/pUh/5C5AtcdKk X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d760e2d-1f9f-4e57-18b8-08dd661410a3 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7779.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2025 11:57:32.2907 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: q8U4bs80LAMctsH2/P/MkFi7s6unB0f1v/51PnNfosdjX973Fd2iMQ5+tNZdvMUAMq9MQyt0Q/dd0nfz6kcVrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6926 X-Patchwork-Delegate: kuba@kernel.org There are actually 2 problems: - deleting the last element doesn't require the memmove of elements [i + 1, end) over it. Actually, element i+1 is out of bounds. - The memmove itself should move size - i - 1 elements, because the last element is out of bounds. The out-of-bounds element still remains out of bounds after being accessed, so the problem is only that we touch it, not that it becomes in active use. But I suppose it can lead to issues if the out-of-bounds element is part of an unmapped page. Fixes: 6666cebc5e30 ("net: dsa: sja1105: Add support for VLAN operations") Signed-off-by: Vladimir Oltean --- drivers/net/dsa/sja1105/sja1105_static_config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c index 3d790f8c6f4d..ffece8a400a6 100644 --- a/drivers/net/dsa/sja1105/sja1105_static_config.c +++ b/drivers/net/dsa/sja1105/sja1105_static_config.c @@ -1917,8 +1917,10 @@ int sja1105_table_delete_entry(struct sja1105_table *table, int i) if (i > table->entry_count) return -ERANGE; - memmove(entries + i * entry_size, entries + (i + 1) * entry_size, - (table->entry_count - i) * entry_size); + if (i + 1 < table->entry_count) { + memmove(entries + i * entry_size, entries + (i + 1) * entry_size, + (table->entry_count - i - 1) * entry_size); + } table->entry_count--;