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 CE5EF25332E; Mon, 13 Apr 2026 16:08:28 +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=1776096508; cv=none; b=AAQrg3/mhFc1L31Ozdd5W8KRMMkEMwrGZryyES9IYlqWz6rJKLDPNxSwGuC9PhUlB8iO23oOUZHg7iLmn6T+n+zniqnhA3LuEuCcxNa34L5Nbv/2h+sh4GzqYSFPbkVHrdLXTqLUKp0M+B664NIWo5vuwhYNZfJNMHDRw3t5Rzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776096508; c=relaxed/simple; bh=8MFcamisTe+oboVHT2tumWE5vb0NgHs4sHM+o+opcN8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eXLpBH5fqRWlcGcxUukxG7ZLDxwd/fmS2a+s1fDY5YG/lezpmSqqEu020kvQE/m+ADredaGjsy3JsRREtEyowMi6dvbXzmnUvcQFllf5B+68vVQVG/YUrHvbw+/duFndEx/8W+399zWkXwHp/qcdoFXE9gwU9jWkMSP3HAjyvjo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a/cJwxzm; 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="a/cJwxzm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 651C0C2BCB0; Mon, 13 Apr 2026 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776096508; bh=8MFcamisTe+oboVHT2tumWE5vb0NgHs4sHM+o+opcN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/cJwxzmrSI74jYqkv6WJTEHDga4hSaXxufxC45seGOLrZXeE/j5+gHfo/yHRUr75 eKL9kZpB3C/38fr9P3B84ew6BOSsAE9AhrQO/hJxDaP2UQrpaASEZLkqcTAvLw7VBJ J1n6buS9qWvBakqv0sVKRWAp72wiCYjX0hNW1UkA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yifan Wu , Juefei Pu , Yuan Tan , Xin Liu , Ren Wei , Ruide Cao , Ren Wei , Sven Eckelmann , Simon Wunderlich Subject: [PATCH 6.18 37/83] batman-adv: reject oversized global TT response buffers Date: Mon, 13 Apr 2026 18:00:05 +0200 Message-ID: <20260413155732.401647922@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155731.019638460@linuxfoundation.org> References: <20260413155731.019638460@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ruide Cao commit 3a359bf5c61d52e7f09754108309d637532164a6 upstream. batadv_tt_prepare_tvlv_global_data() builds the allocation length for a global TT response in 16-bit temporaries. When a remote originator advertises a large enough global TT, the TT payload length plus the VLAN header offset can exceed 65535 and wrap before kmalloc(). The full-table response path still uses the original TT payload length when it fills tt_change, so the wrapped allocation is too small and batadv_tt_prepare_tvlv_global_data() writes past the end of the heap object before the later packet-size check runs. Fix this by rejecting TT responses whose TVLV value length cannot fit in the 16-bit TVLV payload length field. Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific") Cc: stable@vger.kernel.org Reported-by: Yifan Wu Reported-by: Juefei Pu Co-developed-by: Yuan Tan Signed-off-by: Yuan Tan Suggested-by: Xin Liu Tested-by: Ren Wei Signed-off-by: Ruide Cao Signed-off-by: Ren Wei Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/translation-table.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -798,8 +798,8 @@ batadv_tt_prepare_tvlv_global_data(struc { u16 num_vlan = 0; u16 num_entries = 0; - u16 change_offset; - u16 tvlv_len; + u16 tvlv_len = 0; + unsigned int change_offset; struct batadv_tvlv_tt_vlan_data *tt_vlan; struct batadv_orig_node_vlan *vlan; u8 *tt_change_ptr; @@ -816,6 +816,11 @@ batadv_tt_prepare_tvlv_global_data(struc if (*tt_len < 0) *tt_len = batadv_tt_len(num_entries); + if (change_offset > U16_MAX || *tt_len > U16_MAX - change_offset) { + *tt_len = 0; + goto out; + } + tvlv_len = *tt_len; tvlv_len += change_offset;