From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2EB7654BD4; Tue, 27 Feb 2024 13:59:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709042377; cv=none; b=EX4BNQ2JhljJOQGQQ89MMNZ4fXI09pGFZx3+8q+Zgmm8KUqO8ZLF7/89efHxGbY1o6j9iSDm7nKtmmBshHgoYOnpdRkvMmid8Ccy2q3oIpqTAHBILtE2ZKbLcm8wV7BFQZp424lbqYD5SLvAciJraTIo5IYDioUDn/hMdC7kH9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709042377; c=relaxed/simple; bh=udkftGs+UCI78iMSZgtrTx5ntkGLlCrwI7Yq2l9pMA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bcPjUTdDGBOySxgR/Gp/wYzfKsStz+SBnJjN1ctvj3My5ndQDp0twf7Sf2u5W94eDqSS/kyMqFsH/e72k3N7AQhiXItJdEytScziISlmaSIDNlgOpI5KtMM91ZjM+zkRATOP0FeYGQnCfv1WxQJl0HhSo/nhADk1dWd4CjyZgkU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IFfB8H05; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IFfB8H05" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAE13C43394; Tue, 27 Feb 2024 13:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709042377; bh=udkftGs+UCI78iMSZgtrTx5ntkGLlCrwI7Yq2l9pMA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IFfB8H05dQvzZkAFvcak8C7IyvLIsEXzA8sb2O22yeQKOfPpvZbtKZbiYbDAbX0m4 jE46rck0izJO6SjEyUe6ugW9kg9LL0wgtsyEWP4HqnvSnnVyFYttcDnCBPZcgDwDPa bPrtT0ub0BHWDKw4RZG4Nj3AMZY1RbZuN46G+UcU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Nicolas Dichtel , "David S. Miller" , Sasha Levin Subject: [PATCH 6.6 246/299] ipv6: properly combine dev_base_seq and ipv6.dev_addr_genid Date: Tue, 27 Feb 2024 14:25:57 +0100 Message-ID: <20240227131633.649852759@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131625.847743063@linuxfoundation.org> References: <20240227131625.847743063@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Eric Dumazet [ Upstream commit e898e4cd1aab271ca414f9ac6e08e4c761f6913c ] net->dev_base_seq and ipv6.dev_addr_genid are monotonically increasing. If we XOR their values, we could miss to detect if both values were changed with the same amount. Fixes: 63998ac24f83 ("ipv6: provide addr and netconf dump consistency info") Signed-off-by: Eric Dumazet Cc: Nicolas Dichtel Signed-off-by: Eric Dumazet Acked-by: Nicolas Dichtel Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv6/addrconf.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b007d098ffe2e..7881446a46c4f 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -706,6 +706,22 @@ static int inet6_netconf_get_devconf(struct sk_buff *in_skb, return err; } +/* Combine dev_addr_genid and dev_base_seq to detect changes. + */ +static u32 inet6_base_seq(const struct net *net) +{ + u32 res = atomic_read(&net->ipv6.dev_addr_genid) + + net->dev_base_seq; + + /* Must not return 0 (see nl_dump_check_consistent()). + * Chose a value far away from 0. + */ + if (!res) + res = 0x80000000; + return res; +} + + static int inet6_netconf_dump_devconf(struct sk_buff *skb, struct netlink_callback *cb) { @@ -739,8 +755,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb, idx = 0; head = &net->dev_index_head[h]; rcu_read_lock(); - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ - net->dev_base_seq; + cb->seq = inet6_base_seq(net); hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) goto cont; @@ -5358,7 +5373,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, } rcu_read_lock(); - cb->seq = atomic_read(&tgt_net->ipv6.dev_addr_genid) ^ tgt_net->dev_base_seq; + cb->seq = inet6_base_seq(tgt_net); for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) { idx = 0; head = &tgt_net->dev_index_head[h]; -- 2.43.0