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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 1A648C2D0DB for ; Tue, 28 Jan 2020 14:23:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D876F24686 for ; Tue, 28 Jan 2020 14:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221419; bh=YofoTy7gVRUkS9Dp3Lc16Xyaz/RT4b+nv9P7oh9tg+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q7Um/a42eqEkvtZHmcGqyIBkQ+IixiQD9HCsPCjAGDeWISbT6fOeyNBc1KJZJCVDz 0OBsbtkDdJO6qPdwszm/mbu/u7ojiCDwdUEmzzNSwz1rjxr0UWdOE/vexmWT9+kFAf 0MSh0t0f/MGoWEdCn/8qgAzCzTCuU3L/s14tECiA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731232AbgA1OXh (ORCPT ); Tue, 28 Jan 2020 09:23:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:49722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730922AbgA1OXd (ORCPT ); Tue, 28 Jan 2020 09:23:33 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B780821739; Tue, 28 Jan 2020 14:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221413; bh=YofoTy7gVRUkS9Dp3Lc16Xyaz/RT4b+nv9P7oh9tg+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TC1qEy6A10UQX4l6c+4eJHGlDfakjesPCYFSVDpv4vVkHJ3mduFAUP41qvzt7oElI 6NB3C+keWfZwwwBsENfJY2Ho1WXxiE1wxxRNRlR07ZwPxOijF1ky2KCwxKqI8i4W+h Ef/G9//jO6i5j+wDK3FEZ9wH4mnMpFtYP2Y/Q5SE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Jakub Kicinski , Sasha Levin Subject: [PATCH 4.9 214/271] act_mirred: Fix mirred_init_module error handling Date: Tue, 28 Jan 2020 15:06:03 +0100 Message-Id: <20200128135908.459853485@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YueHaibing [ Upstream commit 11c9a7d38af524217efb7a176ad322b97ac2f163 ] If tcf_register_action failed, mirred_device_notifier should be unregistered. Fixes: 3b87956ea645 ("net sched: fix race in mirred device removal") Signed-off-by: YueHaibing Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/act_mirred.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index fc3650b061924..9b4c7c42c932d 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -332,7 +332,11 @@ static int __init mirred_init_module(void) return err; pr_info("Mirror/redirect action on\n"); - return tcf_register_action(&act_mirred_ops, &mirred_net_ops); + err = tcf_register_action(&act_mirred_ops, &mirred_net_ops); + if (err) + unregister_netdevice_notifier(&mirred_device_notifier); + + return err; } static void __exit mirred_cleanup_module(void) -- 2.20.1