2020-08-27 14:17:42

by Yue Haibing

Subject: [PATCH net-next] netfilter: xt_HMARK: Use ip_is_fragment() helper

Use ip_is_fragment() to simpify code.

Signed-off-by: YueHaibing <[email protected]>
---
net/netfilter/xt_HMARK.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/xt_HMARK.c b/net/netfilter/xt_HMARK.c
index 713fb38541df..8928ec56c388 100644
--- a/net/netfilter/xt_HMARK.c
+++ b/net/netfilter/xt_HMARK.c
@@ -276,7 +276,7 @@ hmark_pkt_set_htuple_ipv4(const struct sk_buff *skb, struct hmark_tuple *t,
return 0;

/* follow-up fragments don't contain ports, skip all fragments */
- if (ip->frag_off & htons(IP_MF | IP_OFFSET))
+ if (ip_is_fragment(ip))
return 0;

hmark_set_tuple_ports(skb, (ip->ihl * 4) + nhoff, t, info);
--
2.17.1

2020-08-28 17:57:19

by Pablo Neira Ayuso

Subject: Re: [PATCH net-next] netfilter: xt_HMARK: Use ip_is_fragment() helper

On Thu, Aug 27, 2020 at 10:08:13PM +0800, YueHaibing wrote:
> Use ip_is_fragment() to simpify code.

Applied.