From patchwork Sat Apr 22 01:47:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1772206 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=d38g9NMs; 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 4Q3DmY5sb8z23tr for ; Sat, 22 Apr 2023 11:47:41 +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 1pq2Lf-0002BK-Fb; Sat, 22 Apr 2023 01:47:35 +0000 Received: from mail-co1nam11on2057.outbound.protection.outlook.com ([40.107.220.57] helo=NAM11-CO1-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 1pq2Lb-00028Y-1x for kernel-team@lists.ubuntu.com; Sat, 22 Apr 2023 01:47:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h6mu7WSDKmWIrodVtO6R8WsGtLNS9oGjSdR0MBAq/NQUp9db14fU5EinrWJY2bVNnjoP6kmKMNy3vSwyqlth3+Q85O8tFxX5YUUJZJKfLk9ak2tSx7KPY0kStUs1RUP1rGMOi1i2+0SpYv9Tg+ix0rtNytDx9+nIplMRPHYDlw0dErcCAp/SW778XovUxV7G8x1y2ImS7l/5u9ck6y1PpNH2fedz0uISw6W9z68AGAeu+ENGcn/RKb4tH0XXwhxKW/+npfw1u3qQuxFkoIpcp4sWHiaaC+NYJFznkzr41yEDMH3VVqBkKDwYXCe/2wb0pytnEV4yvNa6r1VMyCkOtA== 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=NaqVoYWDVi8d7qKal00iQiOE1T3gmVm6EvPydEi7Jaw=; b=O+jdOz5635m8Gw1oOC/lOr9XbJqMftDXCIOs54Plj/i+62wBAcOohjRFYvSvtGQQQNTZzA5buXddz7r+YJCCedilTkvn8Lwbst0lUthTuNsPMYCSXvbE/+hCjWHbOG/6l9TL29Jw7cWXp3vy/0L9syEFj/G8zKqC8deHb4vWdFoXHxXRLfmbqvhH3J/h3BWlHRJvG+rt190/0q1BLqzC9OCB12T7kl5KzhEAEhMQYb078bAP/73Nb7v1rZ93Og75J6jAIAK6leqaC0Mf4Phyik6epe5RJl9IeajqK1umPEyFLWWkXvfJbw35n2F6d5yQocockOwk6nC4PCjTplPrlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=NaqVoYWDVi8d7qKal00iQiOE1T3gmVm6EvPydEi7Jaw=; b=d38g9NMscLXWoFvyy6+zdG+Yse3nZnUqOyBsXUHvL/xlhM6Yj4+BHdEbQ6Sz94Lx+Zx/VVVA6c3lkCKK+uhb29m25+0dcLDbB3n5VmFTL97F9B4HBcUXu87fpJwUrz3hBk9KZ7KiOqgDqtHeCFG4Fhn9DzkwxG3ibLlEpXvrbxClmfGsGtqgxABdyAP9KX7rTpIz5N86YNB7HMsmqxQwH7neBMf0mXiiXND76/bIi8pobNv/nNa7gepQZDP7qrQopyAWlNoYqE72ky8Zc9QJs6QC9uNltrbHpuPyRN2ytnu6N9GxxDE0xPuL8eblONitLaN+SUSb8wnWdgWw9HT3EQ== Received: from MN2PR20CA0064.namprd20.prod.outlook.com (2603:10b6:208:235::33) by SN7PR12MB7324.namprd12.prod.outlook.com (2603:10b6:806:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.22; Sat, 22 Apr 2023 01:47:28 +0000 Received: from BL02EPF0000C402.namprd05.prod.outlook.com (2603:10b6:208:235:cafe::ef) by MN2PR20CA0064.outlook.office365.com (2603:10b6:208:235::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.27 via Frontend Transport; Sat, 22 Apr 2023 01:47:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BL02EPF0000C402.mail.protection.outlook.com (10.167.241.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.15 via Frontend Transport; Sat, 22 Apr 2023 01:47:27 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Fri, 21 Apr 2023 18:47:13 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Fri, 21 Apr 2023 18:47:13 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37 via Frontend Transport; Fri, 21 Apr 2023 18:47:12 -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 33M1l76S008750; Sat, 22 Apr 2023 04:47:09 +0300 From: William Tu To: Subject: [SRU][F:linux-bluefield][PATCH v1 1/5] Revert "net/sched: flower: fix fl_change() error recovery path" Date: Sat, 22 Apr 2023 04:47:02 +0300 Message-ID: <20230422014706.594733-2-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230422014706.594733-1-witu@nvidia.com> References: <20230422014706.594733-1-witu@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000C402:EE_|SN7PR12MB7324:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d9676ef-a2a4-4e01-c401-08db42d38736 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PiHYT5E72a86ZlchJ7YJXboPMdbxIbCvILCw6B1SfpQdFsjJc1rgkUVOnCGVa7fpmB7lxOA/3K8aWnD8t+yFXzoNNx+Jnrd079oWIkHbt/keCLNaOyo1M/x1U6ryghgzUngL3RYG1Qm/TDX1HB+2JS8zLD5kFsU6pHVo8gUvs/UxDSQ43QaHL8nhLymg2nygGG9Wsfg9Tae1rCUBgieVnxSlJigWFRMzS/OIbk6+RlZPDr+LbkXQOcg0sCMKrT7faHJJKDUQFtCykgIDPuZpiee5BkCeUB4kRv6+e8vEQqbwtLV4VSYzGSW6zuTDJHhe3+BzSDmtbE3CzuJh+aL1Gg4W/eJmr47FdT+CTuqJb4LdKa1HxvkfvVuaYUuX8SDlh3Box7JR8Arq4/GoyV4usTVP2ZM97QU4xaBK1kI6rziiGbvK+S/SRlTjf3UJS7dWWIVqzlGzHJNCiSp0+Mu4dDyukcIO04UVdPXme6v+SE+Iv93vTAGQqeFY+Q1Ex9cngdyvz6QR+WyIInahnSa8iZ9vQTpasHktKMB0B+vs3b8U8REf84gSxNTm4IJW99AxE+Q7ovEa+WmZ98bI4l6q3x52j1Le/WmhE+YEagBTLCNN7cj6JzYAzFQb03drgOnV1ccodiBVaIpsvLhHZukeTISUP2/15K8YPsgcjbNeBlpCMtAfKrisdOyicpmbs/0lOwfV98G1e0qrncRV2wLHlrYU9qH7+E/six5FeGL9sKjxh3DwpS4fMFv+EisDKumj X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(346002)(136003)(396003)(451199021)(46966006)(40470700004)(36840700001)(5660300002)(70206006)(70586007)(6916009)(2906002)(4744005)(8936002)(316002)(4326008)(8676002)(41300700001)(54906003)(83380400001)(478600001)(40460700003)(6666004)(26005)(356005)(186003)(7636003)(107886003)(40480700001)(36860700001)(36756003)(2616005)(1076003)(47076005)(82310400005)(336012)(82740400003)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2023 01:47:27.5228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0d9676ef-a2a4-4e01-c401-08db42d38736 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.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0000C402.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7324 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" This reverts commit 635ef758926c0acdb84cb96cd3b36554b3e7558d. --- net/sched/cls_flower.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index c347861dfcc1..2431456a58cd 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1841,9 +1841,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, fnew->flags = nla_get_u32(tb[TCA_FLOWER_FLAGS]); if (!tc_flags_valid(fnew->flags)) { - kfree(fnew); err = -EINVAL; - goto errout_tb; + goto errout; } } @@ -1868,10 +1867,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, } spin_unlock(&tp->lock); - if (err) { - kfree(fnew); - goto errout_tb; - } + if (err) + goto errout; } fnew->handle = handle; @@ -1980,6 +1977,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, fl_mask_put(head, fnew->mask); errout_idr: idr_remove(&head->handle_idr, fnew->handle); +errout: __fl_put(fnew); errout_tb: kfree(tb);