From patchwork Thu Jan 14 01:29:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 363443 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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, 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 5F042C43217 for ; Thu, 14 Jan 2021 01:50:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C0932310A for ; Thu, 14 Jan 2021 01:50:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728792AbhANBuM (ORCPT ); Wed, 13 Jan 2021 20:50:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:38650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728770AbhANBuG (ORCPT ); Wed, 13 Jan 2021 20:50:06 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55D7F2310A; Thu, 14 Jan 2021 01:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610587789; bh=mo45egw9EobPzWEzb+Rc6Su03umx9Va6J5jOJTpwnY0=; h=From:To:Cc:Subject:Date:From; b=YTa8HT5Cbcgye87WTGLIWwP00/molGgxkWhxj+rpqzl62QkgZqSwt0PtsS1HP01LI WOh3HhUeO2+70uVs3QBG1u7SxOO3T02xa21Zuax0Fi57+7NxOND1gtBnyFPG1hy1/o dx0ujZAB5IJucETSMQVH0YanMXEQYfamV3L824iDvJTJWQt5SfuEx7iuo2nN9tfx7C Fp1ArcYrqSKLJ13Rivabm9WSh5kBTdHatM6HU907worWg29nqbesVwTsaAmb76ZMH0 1gQV7ITS7nPEjAe2oxKU/RdQm/Dz2sDUuygbefaVJDZ3kbocSGEVf8m2Ft7KsEPohr cOtLlJ1shPRyg== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, nicolas.dichtel@6wind.com, Jakub Kicinski , syzbot+2393580080a2da190f04@syzkaller.appspotmail.com Subject: [PATCH net] net: sit: unregister_netdevice on newlink's error path Date: Wed, 13 Jan 2021 17:29:47 -0800 Message-Id: <20210114012947.2515313-1-kuba@kernel.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to unregister the netdevice if config failed. .ndo_uninit takes care of most of the heavy lifting. This was uncovered by recent commit c269a24ce057 ("net: make free_netdev() more lenient with unregistering devices"). Previously the partially-initialized device would be left in the system. Reported-and-tested-by: syzbot+2393580080a2da190f04@syzkaller.appspotmail.com Fixes: e2f1f072db8d ("sit: allow to configure 6rd tunnels via netlink") Signed-off-by: Jakub Kicinski --- net/ipv6/sit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 2da0ee703779..440175bc2e89 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1645,8 +1645,11 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev, } #ifdef CONFIG_IPV6_SIT_6RD - if (ipip6_netlink_6rd_parms(data, &ip6rd)) + if (ipip6_netlink_6rd_parms(data, &ip6rd)) { err = ipip6_tunnel_update_6rd(nt, &ip6rd); + if (err) + unregister_netdevice_queue(dev, NULL); + } #endif return err;