From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3A753B1ECC; Tue, 21 Jul 2026 20:35:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784666112; cv=none; b=bTjT5U/cXFpr1Vwn+TVGni0tzOU4I1RCzaTOPGM+5ezycdJBWV9bsQ87shB3V1KH+NFzqvV/AvS3MVpe0qu2c+ZqL4aSYeGKTDUpjk+K2fWOLjivij7APgBGNkz45P2y6YJyy12j1w9Ky9jz2HktkIr6QFwP3yuf7/TbsINRCs0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784666112; c=relaxed/simple; bh=/6EixvjmA6tVFsVlyClUls1Z1XS27BaZosHNAw0wHcs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dOr5PRSAX6BOQklmLsO+VLl0RYMH2b7jrKyadKzFD9dGOOz8jLs7dhNI6NkvdFiPlJMU+w8Vd0qWUTKZf8HFC4BAN01IT18PAeZYZOQL5tkuouklFX3e9lrSobV+ZNkUf3pbsz7WgCCKmR80WrEGLbw5PUv1i3dYn3sClPE+1Q4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=m4FFDfea; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="m4FFDfea" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13DB61F000E9; Tue, 21 Jul 2026 20:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784666111; bh=NV6WGHZJ9Nw2O0ymXIZAyCf/InmQ59L3vsdDgDp1DAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=m4FFDfean3FXonOt7UChrATEJK7LGOfYx3jeGpwz8exR9hcZ9Bbx9KwwZ8/wunoKy gUvASog1V0SiDwHwCaENRdY/rgz9bsWUhIJvHOrFETPQbR5st5g1pHKoWjzzMWpUkr nypf9B1wPzGITJMLI6hAUv21FgRMCcYcFfEY1xAg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuniyuki Iwashima , Ido Schimmel , David Ahern , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 0560/1266] net: fib_rules: Dont dump dying fib_rule in fib_rules_dump(). Date: Tue, 21 Jul 2026 17:16:37 +0200 Message-ID: <20260721152454.397595476@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuniyuki Iwashima [ Upstream commit 2821e85c058f81c9948a2fb1a634f7b47457d51c ] rocker_router_fib_event() calls fib_rule_get() during RCU dump. If the fib_rule is dying, refcount_inc() will complain about it. Let's call refcount_inc_not_zero() in fib_rules_dump(). Fixes: 5d7bfd141924 ("ipv4: fib_rules: Dump FIB rules when registering FIB notifier") Signed-off-by: Kuniyuki Iwashima Reviewed-by: Ido Schimmel Reviewed-by: David Ahern Link: https://patch.msgid.link/20260610061744.2030996-3-kuniyu@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/net/fib_rules.h | 5 +++++ net/core/fib_rules.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index 82da359bca035d..c47f6f6d3cada6 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h @@ -107,6 +107,11 @@ static inline void fib_rule_get(struct fib_rule *rule) refcount_inc(&rule->refcnt); } +static inline bool fib_rule_get_safe(struct fib_rule *rule) +{ + return refcount_inc_not_zero(&rule->refcnt); +} + static inline void fib_rule_put(struct fib_rule *rule) { if (refcount_dec_and_test(&rule->refcnt)) diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 75282222e0b456..e31873c87c0a36 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -328,7 +328,7 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl, if (err != -EAGAIN) { if ((arg->flags & FIB_LOOKUP_NOREF) || - likely(refcount_inc_not_zero(&rule->refcnt))) { + likely(fib_rule_get_safe(rule))) { arg->rule = rule; goto out; } @@ -386,8 +386,12 @@ int fib_rules_dump(struct net *net, struct notifier_block *nb, int family, if (!ops) return -EAFNOSUPPORT; list_for_each_entry_rcu(rule, &ops->rules_list, list) { + if (!fib_rule_get_safe(rule)) + continue; + err = call_fib_rule_notifier(nb, FIB_EVENT_RULE_ADD, rule, family, extack); + fib_rule_put(rule); if (err) break; } -- 2.53.0