Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp242333pxj; Thu, 20 May 2021 08:25:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCPMojS+KI101PT3fEoAUspWDY69d40VBm8j5UJsaPmr03OoTnOiNdVasL7tL/wAkaYktL X-Received: by 2002:a05:6e02:190b:: with SMTP id w11mr6448409ilu.197.1621524324110; Thu, 20 May 2021 08:25:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621524324; cv=none; d=google.com; s=arc-20160816; b=xiIgyC9LdyYTTaivhhBBY6S956Kds3SoVCIb9QizORSet9/x6dxmRNkjOBkKFCuF+1 5FbOXxRx2Tk0kS9gNpL0l74R1ZxTqNLMg5wYCdRMOxnwSlNBJ0AtCWvhYB7rGcKx005l Xf2z2cRSzXqbuhZrq8ADvJzUI3anVNujBsLNXf9pTQcOWfeUVu1PboQ/jjAAEzhEYt/Y z3sTz1Ji5+uVa6xzdXsG40da/Zepxdatf3JuQYHBTrELcE8w7GumQy8d13XIprUmY0uc +5UFSDMMKnJCJEPc4abK6XHw4JTBsrSNpHNC7IJ0GnLuMS1SU7+PZJTZknw2wIkcWCfZ A5Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KvkqQusN3oklcL3aF5TNv6jURhNglMnokG87R/h+O+I=; b=h/XxYsRwCeeOa7cnlLI+PjQuVJL4rDswwuPHrA2HHSM6Lx+beQT8H8HqHn+p6mnTi1 Qro+zXz2O6wZM/n8lbU8EqTaw+Gm87hAaVH5SnLNaVAq/WCBwvKbMI877+CTrTWnGPdd FY3g1bZQ16pC/M9Qo7yMOVcR2timwyufnLlrXR4nx9NzIRsNKCGhDtSKHdh/mYPrGChV unlENVFIra9dtFst+Tw+bBqpcJAzxcSWzYJWUSXMavnVvgjo3yQAE7Ahdr49cRWXGXiX spzxYsLslBCT7HvQpifXJ55WOlaI3yaQ6iRHnNoqL3tzIjmw7N/rtrO6S98FrnEhtEem PRYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EcyC629Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a16si2597204ilr.160.2021.05.20.08.25.10; Thu, 20 May 2021 08:25:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EcyC629Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232690AbhETJfy (ORCPT + 99 others); Thu, 20 May 2021 05:35:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:35510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231927AbhETJdj (ORCPT ); Thu, 20 May 2021 05:33:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 10F3E613F5; Thu, 20 May 2021 09:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502931; bh=hjlJmtuoAWovcq8Bg6AaOJIIXFMFpTiRlsVKqveR0Kc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EcyC629Q924KgmsTWzdcapysU1J6ANLR4Z0NLf3TJYQMAyOZ2WTrOavEKKVJj46ed SMWKF6FLFZuebbu2Y3spfUoKQsdB7MGS/KtsJZeAaXG5GjeruaaQ+NrO94zPOo8BeQ /frLBR2TTP7ZbVWvuDbOctBnKgiPZAUAoDNoR3nE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , syzbot , "David S. Miller" Subject: [PATCH 5.4 31/37] ip6_gre: proper dev_{hold|put} in ndo_[un]init methods Date: Thu, 20 May 2021 11:22:52 +0200 Message-Id: <20210520092053.302225370@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092052.265851579@linuxfoundation.org> References: <20210520092052.265851579@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: Eric Dumazet commit 7f700334be9aeb91d5d86ef9ad2d901b9b453e9b upstream. After adopting CONFIG_PCPU_DEV_REFCNT=n option, syzbot was able to trigger a warning [1] Issue here is that: - all dev_put() should be paired with a corresponding dev_hold(), and vice versa. - A driver doing a dev_put() in its ndo_uninit() MUST also do a dev_hold() in its ndo_init(), only when ndo_init() is returning 0. Otherwise, register_netdevice() would call ndo_uninit() in its error path and release a refcount too soon. ip6_gre for example (among others problematic drivers) has to use dev_hold() in ip6gre_tunnel_init_common() instead of from ip6gre_newlink_common(), covering both ip6gre_tunnel_init() and ip6gre_tap_init()/ Note that ip6gre_tunnel_init_common() is not called from ip6erspan_tap_init() thus we also need to add a dev_hold() there, as ip6erspan_tunnel_uninit() does call dev_put() [1] refcount_t: decrement hit 0; leaking memory. WARNING: CPU: 0 PID: 8422 at lib/refcount.c:31 refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31 Modules linked in: CPU: 1 PID: 8422 Comm: syz-executor854 Not tainted 5.12.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31 Code: 1d 6a 5a e8 09 31 ff 89 de e8 8d 1a ab fd 84 db 75 e0 e8 d4 13 ab fd 48 c7 c7 a0 e1 c1 89 c6 05 4a 5a e8 09 01 e8 2e 36 fb 04 <0f> 0b eb c4 e8 b8 13 ab fd 0f b6 1d 39 5a e8 09 31 ff 89 de e8 58 RSP: 0018:ffffc900018befd0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff88801ef19c40 RSI: ffffffff815c51f5 RDI: fffff52000317dec RBP: 0000000000000004 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff815bdf8e R11: 0000000000000000 R12: ffff888018cf4568 R13: ffff888018cf4c00 R14: ffff8880228f2000 R15: ffffffff8d659b80 FS: 00000000014eb300(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055d7bf2b3138 CR3: 0000000014933000 CR4: 00000000001506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __refcount_dec include/linux/refcount.h:344 [inline] refcount_dec include/linux/refcount.h:359 [inline] dev_put include/linux/netdevice.h:4135 [inline] ip6gre_tunnel_uninit+0x3d7/0x440 net/ipv6/ip6_gre.c:420 register_netdevice+0xadf/0x1500 net/core/dev.c:10308 ip6gre_newlink_common.constprop.0+0x158/0x410 net/ipv6/ip6_gre.c:1984 ip6gre_newlink+0x275/0x7a0 net/ipv6/ip6_gre.c:2017 __rtnl_newlink+0x1062/0x1710 net/core/rtnetlink.c:3443 rtnl_newlink+0x64/0xa0 net/core/rtnetlink.c:3491 rtnetlink_rcv_msg+0x44e/0xad0 net/core/rtnetlink.c:5553 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2502 netlink_unicast_kernel net/netlink/af_netlink.c:1312 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1338 netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1927 sock_sendmsg_nosec net/socket.c:654 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:674 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2350 ___sys_sendmsg+0xf3/0x170 net/socket.c:2404 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2433 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 Fixes: 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT") Signed-off-by: Eric Dumazet Reported-by: syzbot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6_gre.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1483,6 +1483,7 @@ static int ip6gre_tunnel_init_common(str } ip6gre_tnl_init_features(dev); + dev_hold(dev); return 0; cleanup_dst_cache_init: @@ -1876,6 +1877,7 @@ static int ip6erspan_tap_init(struct net dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; ip6erspan_tnl_link_config(tunnel, 1); + dev_hold(dev); return 0; cleanup_dst_cache_init: @@ -1975,8 +1977,6 @@ static int ip6gre_newlink_common(struct if (tb[IFLA_MTU]) ip6_tnl_change_mtu(dev, nla_get_u32(tb[IFLA_MTU])); - dev_hold(dev); - out: return err; }