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 BEDB33FFF85; Tue, 21 Jul 2026 22:44:58 +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=1784673900; cv=none; b=A96W1a35oIYX8khBlgDACPapDEngXUAV/fbQzaRpwkVKeCPb0yHOVY3N0l7KE8VxS5pAfNL+1pftW4zEaPiZirU+Ko56oaRN7Od2Ozk+uUea/Vh7YkoK2ngxrl+ieZVk2FKD48ZY+7m62UxufKCjT5C7F1qluAzoOUsmBAdEgtk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673900; c=relaxed/simple; bh=FIAsIqvbqRCL1QMRrNmIrZfgWnJm78T94ewI2HGwTFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CBH60T0nbEwWeh4dfa0NCWBt0FIzoQHW09gy5Q/326TQEK5/Hpaa/4R0LTe7VIsMrnVgO6mhy/skBUdVXqmQE3IbGfn4tG3ObVlJ2vEWs1+WGzEUpXK7ESvBOFbLPo9YdVd2S1JLEJiA2hwt9jnCWcKMmM7F/V6o8/4pMPU5lNk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a4MOaM64; 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="a4MOaM64" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 318B11F000E9; Tue, 21 Jul 2026 22:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784673898; bh=/3BBJuHXDy2evVwEsSuNEVHMzM1OTkl3jyJnYvQHQ2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=a4MOaM64zkY77RlGgHk8epeabOUbsURzm/2aXdRaZ2c7AbeaEsK+HVFnM4CvrWBj2 RhZgI7BuSsUnA8zaQfhYXdIUcHWIExHSaTfZaW2/QYZwI/2b8J6ulHcUIrHxDxgdaO HiWYSCdRAphD9xNeAgeIEH3B9Oc5n20NvkuVaJTU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+9383b1ff0df4b29ca5e6@syzkaller.appspotmail.com, Eric Dumazet , Steffen Klassert , Sasha Levin Subject: [PATCH 5.10 337/699] xfrm: validate selector family and prefixlen during match Date: Tue, 21 Jul 2026 17:21:36 +0200 Message-ID: <20260721152403.294445535@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 40f0b1047918539f0b0f795ac65e35336b4c2c78 ] syzbot reported a shift-out-of-bounds in xfrm_selector_match() due to AF_UNSPEC selector with large prefixlen (e.g. 128) matched against IPv4 flow (when XFRM_STATE_AF_UNSPEC is set). Fix this by: - Rejecting mismatched families in xfrm_selector_match. - Returning false in addr4_match if prefixlen > 32. - Returning false in addr_match if prefixlen > 128 (prevents overflow). Fixes: 3f0ab59e6537 ("xfrm: validate new SA's prefixlen using SA family when sel.family is unset") Reported-by: syzbot+9383b1ff0df4b29ca5e6@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/6a2fbe35.be3f099c.2836ae.0018.GAE@google.com/T/#u Signed-off-by: Eric Dumazet Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- include/net/xfrm.h | 7 +++++++ net/xfrm/xfrm_policy.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 22f66b689e82c5..695b73b355eed6 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -821,6 +821,9 @@ static inline bool addr_match(const void *token1, const void *token2, unsigned int pdw; unsigned int pbi; + if (prefixlen > 128) + return false; + pdw = prefixlen >> 5; /* num of whole u32 in prefix */ pbi = prefixlen & 0x1f; /* num of bits in incomplete u32 in prefix */ @@ -845,6 +848,10 @@ static inline bool addr4_match(__be32 a1, __be32 a2, u8 prefixlen) /* C99 6.5.7 (3): u32 << 32 is undefined behaviour */ if (sizeof(long) == 4 && prefixlen == 0) return true; + + if (prefixlen > 32) + return false; + return !((a1 ^ a2) & htonl(~0UL << (32 - prefixlen))); } diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index e17faf51f32553..37c4128e313cb2 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -223,6 +223,9 @@ __xfrm6_selector_match(const struct xfrm_selector *sel, const struct flowi *fl) bool xfrm_selector_match(const struct xfrm_selector *sel, const struct flowi *fl, unsigned short family) { + if (family != sel->family && sel->family != AF_UNSPEC) + return false; + switch (family) { case AF_INET: return __xfrm4_selector_match(sel, fl); -- 2.53.0