Skip to content

Commit

Permalink
net/sched: act_ct: Use pskb_network_may_pull()
Browse files Browse the repository at this point in the history
To make the filler functions more generic, use network
relative skb pulling.

Signed-off-by: Paul Blakey <paulb@mellanox.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Paul Blakey authored and David S. Miller committed Mar 4, 2020
1 parent 07ac9d1 commit 4cc5fde
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions net/sched/act_ct.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ tcf_ct_flow_table_fill_tuple_ipv4(struct sk_buff *skb,
unsigned int thoff;
struct iphdr *iph;

if (!pskb_may_pull(skb, sizeof(*iph)))
if (!pskb_network_may_pull(skb, sizeof(*iph)))
return false;

iph = ip_hdr(skb);
Expand All @@ -212,9 +212,9 @@ tcf_ct_flow_table_fill_tuple_ipv4(struct sk_buff *skb,
if (iph->ttl <= 1)
return false;

if (!pskb_may_pull(skb, iph->protocol == IPPROTO_TCP ?
thoff + sizeof(struct tcphdr) :
thoff + sizeof(*ports)))
if (!pskb_network_may_pull(skb, iph->protocol == IPPROTO_TCP ?
thoff + sizeof(struct tcphdr) :
thoff + sizeof(*ports)))
return false;

iph = ip_hdr(skb);
Expand All @@ -241,7 +241,7 @@ tcf_ct_flow_table_fill_tuple_ipv6(struct sk_buff *skb,
struct ipv6hdr *ip6h;
unsigned int thoff;

if (!pskb_may_pull(skb, sizeof(*ip6h)))
if (!pskb_network_may_pull(skb, sizeof(*ip6h)))
return false;

ip6h = ipv6_hdr(skb);
Expand All @@ -254,9 +254,9 @@ tcf_ct_flow_table_fill_tuple_ipv6(struct sk_buff *skb,
return false;

thoff = sizeof(*ip6h);
if (!pskb_may_pull(skb, ip6h->nexthdr == IPPROTO_TCP ?
thoff + sizeof(struct tcphdr) :
thoff + sizeof(*ports)))
if (!pskb_network_may_pull(skb, ip6h->nexthdr == IPPROTO_TCP ?
thoff + sizeof(struct tcphdr) :
thoff + sizeof(*ports)))
return false;

ip6h = ipv6_hdr(skb);
Expand Down

0 comments on commit 4cc5fde

Please sign in to comment.