netfilter: nf_tables: prefer skb_ensure_writable (7418ee4c) · Commits · 戴 / test

net/netfilter/nft_exthdr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,8 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,
		if (i + optl > tcphdr_len \|\| priv->len + priv->offset > optl)
		return;

		if (!skb_make_writable(pkt->skb, pkt->xt.thoff + i + priv->len))
		if (skb_ensure_writable(pkt->skb,
		pkt->xt.thoff + i + priv->len))
		return;

		tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff,

+3 −3

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ static int nft_payload_l4csum_update(const struct nft_pktinfo *pkt,
		tsum));
		}

		if (!skb_make_writable(skb, l4csum_offset + sizeof(sum)) \|\|
		if (skb_ensure_writable(skb, l4csum_offset + sizeof(sum)) \|\|
		skb_store_bits(skb, l4csum_offset, &sum, sizeof(sum)) < 0)
		return -1;

		@@ -259,7 +259,7 @@ static int nft_payload_csum_inet(struct sk_buff skb, const u32 src,
		return -1;

		nft_csum_replace(&sum, fsum, tsum);
		if (!skb_make_writable(skb, csum_offset + sizeof(sum)) \|\|
		if (skb_ensure_writable(skb, csum_offset + sizeof(sum)) \|\|
		skb_store_bits(skb, csum_offset, &sum, sizeof(sum)) < 0)
		return -1;

		@@ -312,7 +312,7 @@ static void nft_payload_set_eval(const struct nft_expr *expr,
		goto err;
		}

		if (!skb_make_writable(skb, max(offset + priv->len, 0)) \|\|
		if (skb_ensure_writable(skb, max(offset + priv->len, 0)) \|\|
		skb_store_bits(skb, offset, src, priv->len) < 0)
		goto err;