Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (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 2C5D5376492 for ; Thu, 30 Apr 2026 15:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.190.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777563760; cv=none; b=VNfOPlnPcpt7W+PgqsqI4Z8szJjskLl4cWWYzvvIC3YZZVc98IskYA19AzOh6ZSCDsUQSNUjZeuHyA6il5dAnz97iyW6o8qMmk0KnUiVDT3kt/jrc9kPTY5DtM3+bPzoGzmy0AmG5/eaqBi6DVonAy7ZYCyfQuMx043Qtp/BsA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777563760; c=relaxed/simple; bh=fhC5YgvOQrru0Gn9OMkr4N4o05zWAOaafGPf0yiLYIY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=aCmjC+XUkVIy9yRIjxHHOi/BXw8+y8SPcxrXQCdnBomgfqith1dbhGxVsLvEp/mjjAN0tc2wWCIs43fIsOnfInLm9B1krVObAlvFC+YN9q7vNoZUAkQ/o/Fr8tMnCs6IeRaSSIFhojWd7J5k27574ONFoU3d4uTgvAGrY/64blY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=WsHQu/hF; arc=none smtp.client-ip=217.70.190.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="WsHQu/hF" Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id EE7056024E for ; Thu, 30 Apr 2026 17:42:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1777563756; bh=B120GNARbXsfG0kr8qScIJm0en0cRwclFP6IhtwAsxk=; h=From:To:Subject:Date:From; b=WsHQu/hF0ImoWWCR0I4gu2YfdZMP6tBIDCS/1QeMyAmyvGTF8Y38FZy76VyeSKKjx ZXO3nHNSat37iEaK38lGp1Rqa806eCgWE+UrFOqq/iWTPkfQBr7MBVodUTfd/87bz5 BgOTvTguY85B+gZN6CzEL33miFSennODLGwoccEzzXxFX09tnPCqm8JKpGLPg+whHw DkkpF4dad3sSVDhgfM9RaFhjtsYvN9exOO/2meyoPiSoCGAUWUctBSYL+zVdyI0ciU D4NYDp8p0GB3eswxL4hDAXuhItBS7MIVtoqIuvu3g9dBT3+ze8m+DeyTWhxHYuNj6p SqNP8GflMzc4Q== From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nf,v6 1/3] netfilter: flowtable: ensure sufficient headroom in xmit path Date: Thu, 30 Apr 2026 17:42:15 +0200 Message-ID: <20260430154217.260522-1-pablo@netfilter.org> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Check for headroom and call skb_expand_head() like in the IP output path to ensure there is sufficient headroom for the mac header when forwarding this packet as suggested by sashiko. Fixes: b5964aac51e0 ("netfilter: flowtable: consolidate xmit path") Signed-off-by: Pablo Neira Ayuso --- v6: new in this series, suggested by sashiko. net/netfilter/nf_flow_table_ip.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c index dbd7644fdbeb..8d5fb7e940a1 100644 --- a/net/netfilter/nf_flow_table_ip.c +++ b/net/netfilter/nf_flow_table_ip.c @@ -471,8 +471,17 @@ struct nf_flow_xmit { static unsigned int nf_flow_queue_xmit(struct net *net, struct sk_buff *skb, struct nf_flow_xmit *xmit) { - skb->dev = xmit->outdev; - dev_hard_header(skb, skb->dev, ntohs(skb->protocol), + struct net_device *dev = xmit->outdev; + unsigned int hh_len = LL_RESERVED_SPACE(dev); + + if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) { + skb = skb_expand_head(skb, hh_len); + if (!skb) + return NF_STOLEN; + } + + skb->dev = dev; + dev_hard_header(skb, dev, ntohs(skb->protocol), xmit->dest, xmit->source, skb->len); dev_queue_xmit(skb); -- 2.47.3