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 946DF16132A for ; Mon, 27 Apr 2026 22:49:34 +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=1777330176; cv=none; b=RNz9V5XAeRabjQaBCLfXoUSBdO9uuhbgPe5a58jKFGGyXlO92BMQDv+wL5P9A35Gw8c4SV1WfBOWD7z/KZbu+/82cqEFZLW26QI7gkKnem2LnQPQrlmQkHQDhLsC2skMK06AG78NrcCPxWl5O/Ka7vjkGehuO5RLMduw8tx7aQY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777330176; c=relaxed/simple; bh=nt7Suv0Eezp+6GL/GaMa0Kf7VSaALXUJSKIKL30h+8w=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=O1cvyH/MbuRen6ifUIcbmhf/85bgnv6hNBBn4YasDYad3zc0Yovpyt/uvbj+iDFOX+L8tQE2WV/oXBEqhE9sgp9v55L2dOZQn+v9YxgAWyVpR5XPH4SuR0aueJwJcPS3X3pygHVyYxCQsD8IXJErz1gNjBm3zHX5LwUSyKPvAWE= 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=SVkezs/G; 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="SVkezs/G" Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id 6D6236017D for ; Tue, 28 Apr 2026 00:49:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1777330172; bh=0UfPkDr6It0h5TRChF527XWHGUjFoWq9buw8jCixh7M=; h=From:To:Subject:Date:From; b=SVkezs/GzcmHlYo2WWqurZMswk72ZGYl4vOU2BZ7W1F/4dxwpPoEgUXEQyUJEHCvP Eiem3RnYynB+w3fHLf4BhEe1Sof0MPXMoi6Ij0q3Hb6/u5oGatG3wRI4+r/dGbidcf DyiG3m3dyweKZ1YrPTQoBhovctloxuRUx3yaidZ75BNgWTIosVEa531SbQwZvTzdAe JoEymB7Jjoojrvg8+at64rYScok81g3hD/nLKxYNL/muJotlakC2IekhJTozCv/eur NLxkLUXiPBe8wgjS3BKwvEJbHiQViIAhBqqi2qW2awMwaEaUmD3N0N4zK/KIGzWhE9 BTtI3+56IxcGw== From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nf,v7 1/3] netfilter: replace skb_try_make_writable() by skb_ensure_writable() Date: Tue, 28 Apr 2026 00:49:27 +0200 Message-ID: <20260427224929.29868-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 skb_try_make_writable() only works on clones and uncloned packets might have their network header in paged fragments. nft_fwd needs to work for the ingress and egress hooks, but the egress hook where skb->data points to the mac header, use skb_network_offset() to include the mac header. The flowtable is fine since it already uses the transport offset. Fixes: d32de98ea70f ("netfilter: nft_fwd_netdev: allow to forward packets via neighbour layer") Fixes: 7d2086871762 ("netfilter: nf_flow_table: move ipv4 offload hook code to nf_flow_table") Signed-off-by: Pablo Neira Ayuso --- v7: no changes, previous v6 posted on the ML has duplicated 1/3 and 2/3. net/netfilter/nf_flow_table_ip.c | 4 ++-- net/netfilter/nft_fwd_netdev.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c index fd56d663cb5b..dbd7644fdbeb 100644 --- a/net/netfilter/nf_flow_table_ip.c +++ b/net/netfilter/nf_flow_table_ip.c @@ -524,7 +524,7 @@ static int nf_flow_offload_forward(struct nf_flowtable_ctx *ctx, return 0; } - if (skb_try_make_writable(skb, thoff + ctx->hdrsize)) + if (skb_ensure_writable(skb, thoff + ctx->hdrsize)) return -1; flow_offload_refresh(flow_table, flow, false); @@ -1037,7 +1037,7 @@ static int nf_flow_offload_ipv6_forward(struct nf_flowtable_ctx *ctx, return 0; } - if (skb_try_make_writable(skb, thoff + ctx->hdrsize)) + if (skb_ensure_writable(skb, thoff + ctx->hdrsize)) return -1; flow_offload_refresh(flow_table, flow, false); diff --git a/net/netfilter/nft_fwd_netdev.c b/net/netfilter/nft_fwd_netdev.c index 4bce36c3a6a0..2cc809303ce8 100644 --- a/net/netfilter/nft_fwd_netdev.c +++ b/net/netfilter/nft_fwd_netdev.c @@ -100,6 +100,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr, int oif = regs->data[priv->sreg_dev]; unsigned int verdict = NF_STOLEN; struct sk_buff *skb = pkt->skb; + int nhoff = skb_network_offset(skb); struct net_device *dev; int neigh_table; @@ -111,7 +112,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr, verdict = NFT_BREAK; goto out; } - if (skb_try_make_writable(skb, sizeof(*iph))) { + if (skb_ensure_writable(skb, nhoff + sizeof(*iph))) { verdict = NF_DROP; goto out; } @@ -132,7 +133,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr, verdict = NFT_BREAK; goto out; } - if (skb_try_make_writable(skb, sizeof(*ip6h))) { + if (skb_ensure_writable(skb, nhoff + sizeof(*ip6h))) { verdict = NF_DROP; goto out; } -- 2.47.3