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 1DBF214AD2B for ; Thu, 16 Jan 2025 19:48:04 +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=1737056887; cv=none; b=iZLZwfmDFQxCS9LzgC49RKKij+wt8UgC9rShr9b4ex2VoRDw/tKf1AWZ2slFt0q0hak5J+zbOEnj9LLqwLVxV7HTuIq6W6+72zJBYBJHRnGPzzT08B0uHUfvKuoYyLhvchPMC0Z2r1RHPIWVxOjkG+vGh4z8gPuew0GERTQe7jg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737056887; c=relaxed/simple; bh=aSrN1qPETHuhow03K04fum1p427hdVrmGlLCQGXlDrQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ASrQLrIT1FVa9DteLo+u+qsyfPU/46oqEo2yO7iORV9y1uZryqC3+xU+DSJHRg2BECHke2BSACmCc2xbO+1XD+gVMxBCfQrqMnJiSz5fg2O6pNqUggaC5TuTha/8nUiyJjuZKFv79NEDDultmzWjxZRsw2pTgPUjiUCOdS87IsA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=evKMElxd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="evKMElxd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF54CC4CED6; Thu, 16 Jan 2025 19:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737056884; bh=aSrN1qPETHuhow03K04fum1p427hdVrmGlLCQGXlDrQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=evKMElxdbARYsEJsmjhmpyuGZnH1S9EJqXANGW0HcUYM2/rHc3bfduL/ig4D28JWL MbyWtQAM5I88f5jJVeQRy5etplgtXqgoGogTn+np9wXNiFkgG2XYnPagd3f1eY/01e 1jSfR6x1NxjqgQ7SdWVfKYnnW95mLgCaiLhspzJ1/dJS4XVkQ3SbeNZgl1ZLAWLZe/ XK97g4+W+9j3T4fsE7Uuw15Xt8f54vRHhOkyQ8c8qy81eg3ztIO17qwMvfcLohRCjh 8D/uTxNmauytZrp/AkyROwsxRuJQsiZRxA3//zQxoqgnVDFGGmnIyYLiCUViRaV8Bb WSw2tZixG6AYw== Message-ID: Date: Thu, 16 Jan 2025 20:47:52 +0100 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH mptcp-net] mptcp: pm: only set fullmesh for subflow endp Content-Language: en-GB To: Paolo Abeni Cc: syzbot+cd16e79c1e45f3fe0377@syzkaller.appspotmail.com, mptcp@lists.linux.dev References: <20250116-mptcp-issue-540-v1-1-b0ba2c126eb8@kernel.org> From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Paolo, On 16/01/2025 19:37, Paolo Abeni wrote: > On 1/16/25 7:15 PM, Matthieu Baerts (NGI0) wrote: >> With the in-kernel path-manager, it is possible to change the 'fullmesh' >> flag. The code in mptcp_pm_nl_fullmesh() expects to change it only on >> 'subflow' endpoints, to recreate more or less subflows using the linked >> address. >> >> Unfortunately, the set_flags() hook was a bit more permissive, and >> allowed 'implicit' endpoints to get the 'fullmesh' flag while it is not >> allowed before. >> >> That's what syzbot found, triggering the following warning: (...) >> Fixes: 73c762c1f07d ("mptcp: set fullmesh flag in pm_netlink") >> Reported-by: syzbot+cd16e79c1e45f3fe0377@syzkaller.appspotmail.com >> Closes: https://lore.kernel.org/6786ac51.050a0220.216c54.00a6.GAE@google.com >> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/540 >> Signed-off-by: Matthieu Baerts (NGI0) >> --- >> net/mptcp/pm_netlink.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c >> index fef01692eaed404e272359df691264f797240d10..7131dc2f312d923a31bb4b0460b6b4663376fbd0 100644 >> --- a/net/mptcp/pm_netlink.c >> +++ b/net/mptcp/pm_netlink.c >> @@ -1986,7 +1986,8 @@ int mptcp_pm_nl_set_flags(struct mptcp_pm_addr_entry *local, >> return -EINVAL; >> } >> if ((local->flags & MPTCP_PM_ADDR_FLAG_FULLMESH) && >> - (entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) { >> + ((entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL) || >> + (entry->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT))) { >> spin_unlock_bh(&pernet->lock); >> NL_SET_ERR_MSG_ATTR(info->extack, attr, "invalid addr flags"); >> return -EINVAL; > > LGTM, thanks! > > slight preference for: > > entry->flags & (MPTCP_PM_ADDR_FLAG_SIGNAL || > MPTCP_PM_ADDR_FLAG_IMPLICIT) > > but definitely not strong opinion about it. Good point! I agree with you. That was in fact my v2, then I switched to a version with: flags & (SUBFLOW | SIGNAL | IMPLICIT) == SUBFLOW but then I realised the case with no "type" (so not subflow, signal nor implicit) was OK in fact, even if it will recreate the subflows for no reasons, but that was already the case before. So I switched back to v1, and forgot about v2 :) Can I add your Acked-by or you prefer not to? Cheers, Matt -- Sponsored by the NGI0 Core fund.