Netdev List
 help / color / mirror / Atom feed
From: Ian Rogers <irogers@google.com>
To: Jon Maloy <jmaloy@redhat.com>,
	Tung Quang Nguyen <tung.quang.nguyen@est.tech>,
	 "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@kernel.org>,
	 Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>
Cc: Simon Horman <horms@kernel.org>,
	netdev@vger.kernel.org,  tipc-discussion@lists.sourceforge.net,
	linux-kernel@vger.kernel.org,  llvm@lists.linux.dev,
	Elkin Cruz <elkin@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH net] tipc: validate peer address attributes in tipc_nl_peer_rm()
Date: Thu, 19 Nov 2026 09:05:56 -0800	[thread overview]
Message-ID: <20261119170556.1518068-1-irogers@google.com> (raw)

tipc_nl_peer_rm() documents TIPC_NLA_NET_ADDR and TIPC_NLA_NET_NODEID as
mutually exclusive ways to identify the peer to remove, but implements
them as two independent if-blocks with no fallback check. If a
TIPC_NL_PEER_REMOVE netlink request provides an empty nested TIPC_NLA_NET
attribute (or only unrelated TIPC_NLA_NET_* attributes), 'addr' remains
uninitialized on the stack and is passed into in_own_node() and
tipc_node_find(). Conversely, if both attributes are supplied, the second
silently overwrites the first.

Return -EINVAL when both attributes are present or when neither is
present.

Found via an x86_64 LLVM=1 (Clang 21.1.8) allyesconfig audit with
-Wconditional-uninitialized enabled; fix and changelog drafted with an AI
coding assistant. Build-tested under LLVM=1 W=1 and
-Wconditional-uninitialized; not runtime-tested over TIPC netlink.

Fixes: 43fcd906d9c1 ("tipc: support 128bit node identity for peer removing")
Signed-off-by: Ian Rogers <irogers@google.com>
---
 net/tipc/node.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 53b0993c2c23..d19ed94b8f41 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -2277,18 +2277,21 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct genl_info *info)
 	/* attrs[TIPC_NLA_NET_NODEID] and attrs[TIPC_NLA_NET_ADDR] are
 	 * mutually exclusive cases
 	 */
+	if (attrs[TIPC_NLA_NET_ADDR] && attrs[TIPC_NLA_NET_NODEID])
+		return -EINVAL;
+
 	if (attrs[TIPC_NLA_NET_ADDR]) {
 		addr = nla_get_u32(attrs[TIPC_NLA_NET_ADDR]);
 		if (!addr)
 			return -EINVAL;
-	}
-
-	if (attrs[TIPC_NLA_NET_NODEID]) {
+	} else if (attrs[TIPC_NLA_NET_NODEID]) {
 		if (!attrs[TIPC_NLA_NET_NODEID_W1])
 			return -EINVAL;
 		*w0 = nla_get_u64(attrs[TIPC_NLA_NET_NODEID]);
 		*w1 = nla_get_u64(attrs[TIPC_NLA_NET_NODEID_W1]);
 		addr = hash128to32(node_id);
+	} else {
+		return -EINVAL;
 	}
 
 	if (in_own_node(net, addr))
-- 
2.56.1.708.g77570a6a1d-goog


                 reply	other threads:[~2026-11-19 17:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119170556.1518068-1-irogers@google.com \
    --to=irogers@google.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=elkin@google.com \
    --cc=horms@kernel.org \
    --cc=jmaloy@redhat.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=tipc-discussion@lists.sourceforge.net \
    --cc=tung.quang.nguyen@est.tech \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox