From patchwork Mon Apr 24 23:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1773159 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=n0zigbVG; 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 4Q523Q38Qsz23v4 for ; Tue, 25 Apr 2023 09:51:45 +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 1pr5y5-0006W6-NC; Mon, 24 Apr 2023 23:51:37 +0000 Received: from mail-bn1nam02on2081.outbound.protection.outlook.com ([40.107.212.81] helo=NAM02-BN1-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 1pr5y3-0006Vq-Pk for kernel-team@lists.ubuntu.com; Mon, 24 Apr 2023 23:51:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cpduO3IVG3SSXrBmvBF1B0PTKHzHTVdQtgzjN7EED2QMyU8T4b0mA+NU1UY+O9GWKQNOr85DFiyW/iku1pe4vxw9jNTrPi3MQXNXMOyaTVs3yDSFdZObUy/iG3fTGfPzMz5k3mSW2y3m2bdEKhZMRP49zSPhBDRcx4+b68/ZYMS8Gno0faQxYoPlbIQCBXj8zzEu6sRYntGulFJ4doqtlrtTavYRYhyo9JfWA19OV09yxsni32dAVAdTKGT0XVRlAN9OpbEbYUoWeHiawzia0eHezhs1qmBE+EZCgfpwxAH6+jd97MqCfi9AzokxLQ/6A1jHOuvgrd2frvghN0K/EA== 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=OIHFoB5U90hSj7dMqGgjrTyYqpR/nAk1worKmKxPkr8=; b=GeeFv5Dj8yuVyAkqtmEOLDiQgtECOz4eJTROPKBFRDm6UKUogsEbYQCu1ujSWK5S0R1sOGNdvjvu77oA7jqrIeZ3ROZL3PIgcdk5YlFGJnBZylOSLxR+CdBqMObyMaycQTqkcvKKWjo0D2ONO/3BUXHiW5EbcHG3O3TX0YbSGecYbFC2qXluZlbKJ/loIaBlQ/ft4QZk2GfQYkLYQkxRrQ6mRoWnzf8+KA2EzBLpej1dgAUTx9C7bk2gPBPwfJr5QDollVIVRSlsW46paslSfzRU1SQyc8pozQKSJfINy9ihXbYuOHnj+yywBK43qM4S8C4boHb45I2chp8FLLPKow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=OIHFoB5U90hSj7dMqGgjrTyYqpR/nAk1worKmKxPkr8=; b=n0zigbVGISL8ane4d547KGwPFu9eIMUdjR8yT9pQ6qyAngQ04MBHXC9vtXbo/zxGlaTb+OD2A1ly50nRq6L0TtGb/Bh2vzDxnORwSJZt2AXOfQpLEG29r/kZJGnOuRgKlSpZYG6otvBNYhJVkvHTogvx0S9c4dM+kBhjkFPsKNKrfw564/hJjwdor0LPcs0s6qwJyy6LexJ3J1boK6+NJQ+kMuNZpQUHbFoUprI742TO6rwGjpbM39EHJJnLACq8U4Z+E7FrIeAWcKovba77PIB8vCMnm/0Oc5q5gm/6HtcUQVNAEbK3YEG+8gtjQnSai31UEtIPBiMJvaWOD5Issw== Received: from MW4PR02CA0028.namprd02.prod.outlook.com (2603:10b6:303:16d::7) by SJ2PR12MB8926.namprd12.prod.outlook.com (2603:10b6:a03:53b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Mon, 24 Apr 2023 23:51:31 +0000 Received: from CO1NAM11FT116.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::58) by MW4PR02CA0028.outlook.office365.com (2603:10b6:303:16d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33 via Frontend Transport; Mon, 24 Apr 2023 23:51:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT116.mail.protection.outlook.com (10.13.174.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.19 via Frontend Transport; Mon, 24 Apr 2023 23:51:31 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 24 Apr 2023 16:51:15 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Mon, 24 Apr 2023 16:51:14 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.129.68.8) 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, 24 Apr 2023 16:51:14 -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 33ONp7us001062; Tue, 25 Apr 2023 02:51:10 +0300 From: William Tu To: Subject: [SRU][F:linux-bluefield][PATCH v2 1/5] Revert "net/sched: flower: fix fl_change() error recovery path" Date: Tue, 25 Apr 2023 02:51:03 +0300 Message-ID: <20230424235107.607162-2-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424235107.607162-1-witu@nvidia.com> References: <20230424235107.607162-1-witu@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT116:EE_|SJ2PR12MB8926:EE_ X-MS-Office365-Filtering-Correlation-Id: 13d83b52-bb15-477f-5f50-08db451ed409 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xbAqk8swDtd0N/C1IduDNn2Cknl6elLumHuu+dERg4H1bi02o6sP/Mo4hWhTMlnNZ2wLHdPa75eIEh4O4j7RogQifVe7eSfVFFKuqfp1i4UFqk3cierCVjIXQO9BR3B0FZXo9YqU1hQL40vc1HGIj0pAxinVyx7MCsREMURD8AC8FW2VgM7qIknktp+MMVFKHi9SyQfvOBuk57OcxiJFdf6lOVpmYQpOnGGqx8odwPPoomO+VBFMuO65yQayTlReq7cy4H39qosgn+G75PJ9WIx8TcFE6G1Z6dQKmwrdlsy2n6ekstdJQJtODrYejfU/ZcY05Kz3qFggefzZOVHCJGdo3YNuTq9XK9wEzwJLPXG02HmuyymyJCOFXyq4duJYxQeIocsmNYB+K7xB1uroTspw2futZKqd2w7hvfj9ddhKaqvWk98/XjD+QcrLzp30Q/vh3z1hyhCTqeyrLCwe9gSXFoXqFgCi0YPDLnIeGnDO3C3GfDN0EEp65KwkEdYZBSFeeAU31fkvBBSSwEFa+UrSIc5qFSmqTvl+PbcBI22NiXusFwI/h9QWSw3HTL1ubjaArn5woswZZYAACIQF8AmzCfTws2Qx4rUNu0LZl5B7tj7KF9LXXXdraFbn7nedNYsFq4PblVz0AdQk8leyv12IXPlZXdTKLzjGTM9k41ynjbbBjMdUS7M0UXJ4hbqbFHrDuSmu2I6g8KOY/2jWOGeb+7Iutqs+sJdHczhvCa1KoUw+PDcGjOzNru4Ousez/YWamrZ+wRtXzYBGde7Ytg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199021)(40470700004)(36840700001)(46966006)(2906002)(40460700003)(41300700001)(356005)(7636003)(5660300002)(8676002)(8936002)(36756003)(82310400005)(86362001)(40480700001)(6666004)(1076003)(107886003)(26005)(966005)(54906003)(34020700004)(478600001)(36860700001)(2616005)(83380400001)(336012)(186003)(47076005)(4326008)(6916009)(82740400003)(316002)(70586007)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2023 23:51:31.0370 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13d83b52-bb15-477f-5f50-08db451ed409 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT116.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8926 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. BugLink: https://bugs.launchpad.net/bugs/2012571 Signed-off-by: William Tu --- 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);