From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C9C7C05031 for ; Mon, 12 Apr 2021 09:43:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A8466125F for ; Mon, 12 Apr 2021 09:43:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243165AbhDLJl1 (ORCPT ); Mon, 12 Apr 2021 05:41:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:34520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241014AbhDLJLY (ORCPT ); Mon, 12 Apr 2021 05:11:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8959C61288; Mon, 12 Apr 2021 09:08:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618218488; bh=o6/EnYGd7uPnVx04dsNL/GpaNHOMtI5F3bDzBPIBsdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFxeVLOAuySR0VhiZj6P/5oAyh+SvgiEBSST/lIeJI0IC48KQrz2endKwbBNxi2mi is8V/Ez2pXtmviqw60A9113qusuYlVI7ZyhwlcMRavIRd4UfsgkrTKRvlisJ+TQRnc Iya4uSXWo7qwwxiicG5oqfRN7pzbssZpd282RW+s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vlad Buslov , "David S. Miller" Subject: [PATCH 5.11 210/210] Revert "net: sched: bump refcount for new action in ACT replace mode" Date: Mon, 12 Apr 2021 10:41:55 +0200 Message-Id: <20210412084023.004668415@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210412084016.009884719@linuxfoundation.org> References: <20210412084016.009884719@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vlad Buslov commit 4ba86128ba077fbb7d86516ae24ed642e6c3adef upstream. This reverts commit 6855e8213e06efcaf7c02a15e12b1ae64b9a7149. Following commit in series fixes the issue without introducing regression in error rollback of tcf_action_destroy(). Signed-off-by: Vlad Buslov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/act_api.c | 3 --- 1 file changed, 3 deletions(-) --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1049,9 +1049,6 @@ struct tc_action *tcf_action_init_1(stru if (!name) a->hw_stats = hw_stats; - if (!bind && ovr && err == ACT_P_CREATED) - refcount_set(&a->tcfa_refcnt, 2); - return a; err_out: