From patchwork Thu Apr 28 23:25:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Kolchmeyer X-Patchwork-Id: 567470 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 954FEC433F5 for ; Thu, 28 Apr 2022 23:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353267AbiD1X3H (ORCPT ); Thu, 28 Apr 2022 19:29:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234016AbiD1X3G (ORCPT ); Thu, 28 Apr 2022 19:29:06 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F946BCB4D for ; Thu, 28 Apr 2022 16:25:50 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2f4e17a5809so60680167b3.2 for ; Thu, 28 Apr 2022 16:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=fe75SRdVaB/DzSXNcSSUKHm8LARXkMuRs+/tYKFLVSc=; b=Sdd4hfD8omUWGnOdA8y8f0Z+2kxPws736xiRQuZJgjvKGG9R5fWvOA2ksa4Jzoynu1 YWXI3ldLPUQhpkSLwVgq1/iUALjeqIDoHzsRs9oV+LxPHW23e6ST/4iacpiKbi9xfpRL n5nlYvPUaY/X8OxmapP7b6rRYcfClIryTJADvunBnVF7bdwjhwBe3PFkGR3BClHGLBW9 vOReb+TPfvyqn004Wkbp5XsXVz3oglzj4dpBk+2urnxKJykVwBWoJRJXEbSgUYaPvhNg VJklN1AtIABRGNX/DMmOVt0ftXG/0oQCFmllYU6ZQKM6sj7bMxgrCoiQ0eCvLeHKtJhX nsDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=fe75SRdVaB/DzSXNcSSUKHm8LARXkMuRs+/tYKFLVSc=; b=XnKwtRx1fm0j4ty+auuqH6lFVXDFRKoFjAnF1rWlTro9NDJoWYr7OAgYCkofp2VYcw h/0IdRfbWXA2pxm5s1OGfItrh5+nxjCCFaaboPnEC0In3+j3QO/0Lu7QbSJVttzpzIP+ Ga4UESY2oiTKkFVqA37g9pwBInf4DLAglog7VmzXTj8kw41VvRDyse1oprjWwtJPKoo3 KbSq6bXzY9derRKtkKzh554ed0F7sGnnb2ks7KSWTK//V+FldzTj08xxoX9GEoTKGVbT IWPUwkfKHRDNQEBXwX5lnD+1Y8phoP5kJ/FajZrDrmZk1YODyDSrEgH+teVzqAJEUFdG uzcA== X-Gm-Message-State: AOAM531ljj4LuPntnO5Gd/UWvJY1zeUJvdXdiOoCwZeBUPuYVrG/iaEQ 2LR4Yj6W7WCTuUllldTGWs2pi0CSslaQJEFtqERqaArQZFZGczd+MZ+MuYhv6VShPaesRoUfF0V p2VywdCrhNCPqISPIAz8QTXlvgwEBlVh3SpujAUo6fmBTJqvbkIx4qh4kbLzvc9nCOWFvCVjy7g == X-Google-Smtp-Source: ABdhPJw+BFQ7/wGMq4YQFYMNsEWUpJX0TLPWuFHInC/3t6OeDXpROIg/dY7umrNp1KBAxEcQ+GKxTOKQG2dppZh3Pw== X-Received: from rkolchmeyer.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:7f04]) (user=rkolchmeyer job=sendgmr) by 2002:a25:dfca:0:b0:645:d61b:1ff9 with SMTP id w193-20020a25dfca000000b00645d61b1ff9mr31127822ybg.310.1651188349566; Thu, 28 Apr 2022 16:25:49 -0700 (PDT) Date: Thu, 28 Apr 2022 16:25:34 -0700 Message-Id: <20220428232534.1230905-1-rkolchmeyer@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH 4.19] net/sched: cls_u32: fix netns refcount changes in u32_change() From: Robert Kolchmeyer To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, edumazet@google.com, rkolchmeyer@google.com, syzbot , Cong Wang , Jiri Pirko , Jamal Hadi Salim , Jakub Kicinski Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Dumazet commit 3db09e762dc79584a69c10d74a6b98f89a9979f8 upstream. We are now able to detect extra put_net() at the moment they happen, instead of much later in correct code paths. u32_init_knode() / tcf_exts_init() populates the ->exts.net pointer, but as mentioned in tcf_exts_init(), the refcount on netns has not been elevated yet. The refcount is taken only once tcf_exts_get_net() is called. So the two u32_destroy_key() calls from u32_change() are attempting to release an invalid reference on the netns. syzbot report: refcount_t: decrement hit 0; leaking memory. WARNING: CPU: 0 PID: 21708 at lib/refcount.c:31 refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31 Modules linked in: CPU: 0 PID: 21708 Comm: syz-executor.5 Not tainted 5.18.0-rc2-next-20220412-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 14 b6 b2 09 31 ff 89 de e8 6d e9 89 fd 84 db 75 e0 e8 84 e5 89 fd 48 c7 c7 40 aa 26 8a c6 05 f4 b5 b2 09 01 e8 e5 81 2e 05 <0f> 0b eb c4 e8 68 e5 89 fd 0f b6 1d e3 b5 b2 09 31 ff 89 de e8 38 RSP: 0018:ffffc900051af1b0 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000040000 RSI: ffffffff8160a0c8 RDI: fffff52000a35e28 RBP: 0000000000000004 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff81604a9e R11: 0000000000000000 R12: 1ffff92000a35e3b R13: 00000000ffffffef R14: ffff8880211a0194 R15: ffff8880577d0a00 FS: 00007f25d183e700(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f19c859c028 CR3: 0000000051009000 CR4: 00000000003506f0 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] ref_tracker_free+0x535/0x6b0 lib/ref_tracker.c:118 netns_tracker_free include/net/net_namespace.h:327 [inline] put_net_track include/net/net_namespace.h:341 [inline] tcf_exts_put_net include/net/pkt_cls.h:255 [inline] u32_destroy_key.isra.0+0xa7/0x2b0 net/sched/cls_u32.c:394 u32_change+0xe01/0x3140 net/sched/cls_u32.c:909 tc_new_tfilter+0x98d/0x2200 net/sched/cls_api.c:2148 rtnetlink_rcv_msg+0x80d/0xb80 net/core/rtnetlink.c:6016 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2495 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x904/0xe00 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:705 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:725 ____sys_sendmsg+0x6e2/0x800 net/socket.c:2413 ___sys_sendmsg+0xf3/0x170 net/socket.c:2467 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2496 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f25d0689049 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f25d183e168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f25d079c030 RCX: 00007f25d0689049 RDX: 0000000000000000 RSI: 0000000020000340 RDI: 0000000000000005 RBP: 00007f25d06e308d R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffd0b752e3f R14: 00007f25d183e300 R15: 0000000000022000 Fixes: 35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()") Signed-off-by: Eric Dumazet Reported-by: syzbot Cc: Cong Wang Cc: Jiri Pirko Acked-by: Jamal Hadi Salim Signed-off-by: Jakub Kicinski [rkolchmeyer: Backported to 4.19: adjusted u32_destroy_key() signature] Signed-off-by: Robert Kolchmeyer --- u32_destroy_key() takes an additional argument (struct tcf_proto *tp) on 4.19, so I updated the patch to include this. But u32_destroy_key() doesn't actually use this argument, so the semantics of the patch aren't impacted by this change. net/sched/cls_u32.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index fe246e03fcd9c..ad82c63094821 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -404,15 +404,20 @@ static int u32_init(struct tcf_proto *tp) return 0; } -static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n, - bool free_pf) +static void __u32_destroy_key(struct tc_u_knode *n) { struct tc_u_hnode *ht = rtnl_dereference(n->ht_down); tcf_exts_destroy(&n->exts); - tcf_exts_put_net(&n->exts); if (ht && --ht->refcnt == 0) kfree(ht); + kfree(n); +} + +static void u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n, + bool free_pf) +{ + tcf_exts_put_net(&n->exts); #ifdef CONFIG_CLS_U32_PERF if (free_pf) free_percpu(n->pf); @@ -421,8 +426,7 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n, if (free_pf) free_percpu(n->pcpu_success); #endif - kfree(n); - return 0; + __u32_destroy_key(n); } /* u32_delete_key_rcu should be called when free'ing a copied @@ -965,13 +969,13 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, tca[TCA_RATE], ovr, extack); if (err) { - u32_destroy_key(tp, new, false); + __u32_destroy_key(new); return err; } err = u32_replace_hw_knode(tp, new, flags, extack); if (err) { - u32_destroy_key(tp, new, false); + __u32_destroy_key(new); return err; }