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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 910FCC33CB3 for ; Thu, 16 Jan 2020 18:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64E5A214AF for ; Thu, 16 Jan 2020 18:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579197766; bh=vJF+Ll0eNNdtR7dU4tcDtQOLQdilD63T1VeiZ+lI00Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nDKJ1yj//LTGwfiyNyPdGmNkkOcmN5+5oA3atf0EdX6vQcn07/WAM7vgTC5vqZr0L xsvl/W7BYbsyWMx067dwhnr+iy1FocYLXhb/9+5u5eASeT7G8mmfVP14tiN4KPKSTa 6PIV1svWALhKxZ6XVndfPIYLhlrnbuIth+AvdhVI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405506AbgAPRlD (ORCPT ); Thu, 16 Jan 2020 12:41:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:58504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405477AbgAPRlC (ORCPT ); Thu, 16 Jan 2020 12:41:02 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EEA762469B; Thu, 16 Jan 2020 17:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196461; bh=vJF+Ll0eNNdtR7dU4tcDtQOLQdilD63T1VeiZ+lI00Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xEB6XHGTe5WrCYC7MOHEMHve3pIci0sKerpHfHlCrQLxralc8/iuS0iGXu1sI8uVt tT66aJzpxkyCYaW/bcr1+wOqhTzAYFgKRz5dlgxbOt+nzDy+zHstQdihwsF2E2WeJm V0PorgHlpKbXPDMVElkwiFlA7DeHWl7JZeASK01Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YueHaibing , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 215/251] act_mirred: Fix mirred_init_module error handling Date: Thu, 16 Jan 2020 12:36:04 -0500 Message-Id: <20200116173641.22137-175-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 fc3650b06192..9b4c7c42c932 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