From patchwork Mon May 15 19:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1781614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=EQAby46x; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QKq960dvNz20db for ; Tue, 16 May 2023 05:26:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pydpS-0002M4-MR; Mon, 15 May 2023 19:25:54 +0000 Received: from mail-dm6nam11on2056.outbound.protection.outlook.com ([40.107.223.56] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pydpL-0002Cy-G3 for kernel-team@lists.ubuntu.com; Mon, 15 May 2023 19:25:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cHsiUE3W7726IWsg2vZIXYl1YfQvCDlDtWML+z7OG+iubV2CyN9bxjYGIajPDu42zWNccErvU/kwXmdlITW7ukBwHvFnWQEdSntA7EjnnFBrkv4u9t+svRrG+SAfHiSQBcjUVfy3xLH4Q5dLPAgVc7bJaHErTs7cEM7+/KrlWaNNUrqoCBhG0UzTUC8o8aOnSQW1B9y7VRXoKZdS134re8yJIjae8DAVCiMzTv1S6RcH7GWQuVNPoNKbqJm3GRUwVJlUIYETrtAframLchZpkqQLjFAqNDBsGEU+07AL1ERyjsE0uAyov3wZWzguGYoNQU7vHhHQlunK2gawuPVK3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=9aeZvLNMBe+F11Lkjk3mSEcuxeDz2pr1Ku1v/fiJ4XQ=; b=hkpnqRve0xvS7/ppq2IiWv0dSWwLpeow+V2wpM5EyKWVi/DehQnOnI8golH4idrx6pxTwyQdgDJQhJBt/LuCAJZJQ0cHqwBi5T6kmVAOrU8biEsNZQCLEzlflW9SHQO3khPSGWRynpeV2brgDu3DpFGCfF+GsRwZXQfnCXD9yaE/0ZpfT9rCi3K7/54KNN32XBmeCi1WeEfUzzIsZstyWE3TWxrc3nnNh+P1JqNNPhY2j5hz93xyyLzuSI7qd8S6fCoKbRfOp6xDZelx57w6dXYdYrKwU9lrzbu5GfsMQ1Sz35oYXCzPcSZ23b+Am98lWrWEBkixCdofCUPdOfrXyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9aeZvLNMBe+F11Lkjk3mSEcuxeDz2pr1Ku1v/fiJ4XQ=; b=EQAby46xDBRD1G53xp403DExUnxNmvSV/+fIaZeo5z95JEWRehr+cx9ZsYVdr2dZ6zhyCmHn3LpM5Vbhv5eP+RJNTkpxtHtQpOgNLWgzmpKTLGVzcIhL7gJr1MiLsLUMcL6TdCtl3XvO5SpgZQGMG1xuX8BmrmW23PcccSlnALzk+B1Noa2iu3B3pXHIRtKD0AmG5vYLrkpAmeYNmUE8cjrwiomjqtNCH8bzI/H+fnPIFxJGpNbyhTppaViuunHD3LqH+Ub7N3TNBW17Qu0Va/VA4tUz0n3waffoB9o1unKt9uY2sfZDsdnlDLLlixhjCOWQky8Yui/Z7X0QLUPKDw== Received: from BYAPR08CA0020.namprd08.prod.outlook.com (2603:10b6:a03:100::33) by IA1PR12MB6281.namprd12.prod.outlook.com (2603:10b6:208:3e7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Mon, 15 May 2023 19:25:44 +0000 Received: from DM6NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:100:cafe::1d) by BYAPR08CA0020.outlook.office365.com (2603:10b6:a03:100::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30 via Frontend Transport; Mon, 15 May 2023 19:25:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DM6NAM11FT056.mail.protection.outlook.com (10.13.173.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.15 via Frontend Transport; Mon, 15 May 2023 19:25:43 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 15 May 2023 12:25:29 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Mon, 15 May 2023 12:25:29 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37 via Frontend Transport; Mon, 15 May 2023 12:25:29 -0700 Received: from sw-mtx-002.mtx.labs.mlnx (sw-mtx-002.mtx.labs.mlnx [10.9.151.106]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 34FJPCGb018130; Mon, 15 May 2023 22:25:26 +0300 From: William Tu To: Subject: [SRU][J:linux-bluefield][PATCH v2 7/7] net/sched: flower: fix error handler on replace Date: Mon, 15 May 2023 22:25:11 +0300 Message-ID: <20230515192511.731277-8-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515192511.731277-1-witu@nvidia.com> References: <20230515192511.731277-1-witu@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT056:EE_|IA1PR12MB6281:EE_ X-MS-Office365-Filtering-Correlation-Id: d9e704b3-10b4-4e9f-5d6b-08db557a2cfc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7bpkJdK5/enc550eUHCBFHwKdsR/GXzImAYWt0pjataTTRB6YM7+lO3jhAhLS8F5vhwI1TdIB44zG0WuDnVJQovx7Dk7aURFR6RvE/uxafCbQ/jBBdoTGYJWRTAeUWavWRMl2hixhPWXsKanh563acjrplVD4kWrNtHYRK9TX4n838xDYxd7g4QblLs+69RLbtQUeMC/L9Zy826VL2I2HLycnK0/hgEYmu7SH76h7a6ZljRTmWtvAHDG4A6FndRy/TOgsS2ZWhzXYElPXdrm/zcni5NlVKArJNf2nTdFAt7ETeRjl5lYAVPgj/TqswEXL9QWtS3LvLPUTHMVf7GeJuax3LHTMDW04w0amsaoJHbtt44ue6vm+d5U+lfrbi5U2ni2h0ywvs68oeddTCcwsNuUB+YNSTjfqBjrk9tdHYjxic6ZyY++irmEGV5EXSe8vWRTNGFv+STHgl9JIJeE7xyBzna1r7tx1bUUZmLBJ8iYRK1q/acKxg3jTe2MiEUgZMxI0Kp0hHCL4AyEAu0MLRTMaIKOJmIkut54qvzlVSRwgJ1BvWWDtGoNgTQq2oWMnMxbQDHmSdbpuFxY5G2jKl3WYuQmcfCo+HClhGR0suV4yxAvZ436PsUnkA36jhXyQH6mTAnt144Cl8NliLWynwCN1hl1vmACHcddgTwsas7QHIWWhCqr2LwpYt1J5/0rhSc/pMAy7l4o2naYGX/wNqtv7XDI47dUapT2mK5KJjJ80WjRiJvlFB70qlmg+Jqsd76SQQZDJmPaE5q8jdZ64O6i3kf+nxkqYUgBpKBiKI4= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(396003)(376002)(346002)(136003)(451199021)(36840700001)(40470700004)(46966006)(36756003)(86362001)(54906003)(316002)(6916009)(70206006)(4326008)(70586007)(966005)(478600001)(82310400005)(40480700001)(5660300002)(8676002)(8936002)(2906002)(6666004)(7636003)(82740400003)(41300700001)(356005)(2616005)(1076003)(186003)(107886003)(26005)(36860700001)(83380400001)(336012)(47076005)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2023 19:25:43.0914 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9e704b3-10b4-4e9f-5d6b-08db557a2cfc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6281 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dann.frazier@canonical.com, paulb@nvidia.com, vlad@nvidia.com, yifeid@nvidia.com, bodong@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Vlad Buslov BugLink: https://bugs.launchpad.net/bugs/2012571 When replacing a filter (i.e. 'fold' pointer is not NULL) the insertion of new filter to idr is postponed until later in code since handle is already provided by the user. However, the error handling code in fl_change() always assumes that the new filter had been inserted into idr. If error handler is reached when replacing existing filter it may remove it from idr therefore making it unreachable for delete or dump afterwards. Fix the issue by verifying that 'fold' argument wasn't provided by caller before calling idr_remove(). Fixes: 08a0063df3ae ("net/sched: flower: Move filter handle initialization earlier") (cherry picked from commit fd741f0d9f702c193b2b44225c004f8c5d5be163) Signed-off-by: Vlad Buslov Reviewed-by: Pedro Tammela Signed-off-by: David S. Miller Signed-off-by: William Tu --- net/sched/cls_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 873253b34bc1..cb55b9a904d7 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -2180,7 +2180,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, errout_mask: fl_mask_put(head, fnew->mask); errout_idr: - idr_remove(&head->handle_idr, fnew->handle); + if (!fold) + idr_remove(&head->handle_idr, fnew->handle); errout: __fl_put(fnew); errout_tb: