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 3E07B3AE19E; Mon, 23 Mar 2026 16:23:03 +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=1774282983; cv=none; b=phF6G0isjjiCCoGGbFFtbDcDrrQA3Mgd2pHo2gpwNMfaNk6Q9gaQDn0hImDJ3wOqe7h4CXduDlMNIcKe+mVLXRVJ/RW1IZUciy1qOYLg4s/fweBTPQOZcqEY02CjDYJbwKHi5k8nEMUOOOGGfEhUOswFGfWXhr3zxMgcCfKsBU8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774282983; c=relaxed/simple; bh=nk8ahJimYxk/2RVeRigIZYjhYdl+mTQRnC7EzdsQmB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XMfPa2B5szmITkAWkdaBX3XMDIpn7bvv2qOWhq1z2aGIhoufnB8og6FaMqemJGq6jggIPQrIjO9Ug6JEJvlOKGfdvP3Uo5g8QzKSfc8lqfXwrBfFOVmVT/qMsHAEvR08zP/eDgDu3vaduYap7M1ZhfXYGolVfXRdX3++Z2LswfY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hEqDEwN6; 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="hEqDEwN6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95607C4CEF7; Mon, 23 Mar 2026 16:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774282982; bh=nk8ahJimYxk/2RVeRigIZYjhYdl+mTQRnC7EzdsQmB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEqDEwN6ZOJg0C/U1DYAtoUxoln6ltvfiPau+sRckroxLQPMdivC14HZZkCk+BKuy +BujkEQJamotrmHHrK+qRkldvMKOZ+wXi26EeYUvLzgE+DhvGMr083lrBAm5SjivsN 22zxAsqFfrHqMtdNOlN2o5psJyOmee0R66S337Sw= 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 , Ao Zhou , Sven Eckelmann , Simon Wunderlich Subject: [PATCH 6.1 357/481] batman-adv: avoid OGM aggregation when skb tailroom is insufficient Date: Mon, 23 Mar 2026 14:45:39 +0100 Message-ID: <20260323134533.806889752@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134525.256603107@linuxfoundation.org> References: <20260323134525.256603107@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yang Yang commit 0d4aef630be9d5f9c1227d07669c26c4383b5ad0 upstream. When OGM aggregation state is toggled at runtime, an existing forwarded packet may have been allocated with only packet_len bytes, while a later packet can still be selected for aggregation. Appending in this case can hit skb_put overflow conditions. Reject aggregation when the target skb tailroom cannot accommodate the new packet. The caller then falls back to creating a new forward packet instead of appending. Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") Cc: stable@vger.kernel.org Reported-by: Yifan Wu Reported-by: Juefei Pu Signed-off-by: Yuan Tan Signed-off-by: Xin Liu Signed-off-by: Ao Zhou Signed-off-by: Yang Yang Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich [ Adjust context ] Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/bat_iv_ogm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -465,6 +465,9 @@ batadv_iv_ogm_can_aggregate(const struct !time_after_eq(aggregation_end_time, forw_packet->send_time)) return false; + if (skb_tailroom(forw_packet->skb) < packet_len) + return false; + if (aggregated_bytes > BATADV_MAX_AGGREGATION_BYTES) return false;