icmp: move duplicate code in helper functions
Subsystems (5)
cover icmp: move duplicate code in helper functions
Remove some duplicate code by moving it in two helper functions. First patch adds the helpers, the second one uses it.
Matteo Croce (2):
icmp: add helpers to recognize ICMP error packets
icmp: remove duplicate code
include/linux/icmp.h | 15 +++++++++++++++ include/linux/icmpv6.h | 14 ++++++++++++++ net/ipv4/netfilter/nf_socket_ipv4.c | 10 +--------- net/ipv4/route.c | 5 +---- net/ipv6/route.c | 5 +---- net/netfilter/nf_conntrack_proto_icmp.c | 6 +----- net/netfilter/xt_HMARK.c | 6 +----- net/sched/act_nat.c | 4 +--- 8 files changed, 35 insertions(+), 30 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/2 icmp: add helpers to recognize ICMP error packets
Add two helper functions, one for IPv4 and one for IPv6, to recognize the ICMP packets which are error responses.
This packets are special because they have as payload the original header of the packet which generated it (RFC 792 says at least 8 bytes, but Linux actually includes much more than that).
--- include/linux/icmp.h | 15 +++++++++++++++ include/linux/icmpv6.h | 14 ++++++++++++++ 2 files changed, 29 insertions(+)
include/linux/icmp.h +15 -0
@@ -20,4 +20,19 @@ static inline struct icmphdr *icmp_hdr(const struct sk_buff *skb) {return (struct icmphdr *)skb_transport_header (skb); } + +static inline bool icmp_is_err (int type) +{ +switch (type) { +case ICMP_DEST_UNREACH : +case ICMP_SOURCE_QUENCH : +case ICMP_REDIRECT : +case ICMP_TIME_EXCEEDED : +case ICMP_PARAMETERPROB : +return true; + } + +return false; +} +#endif /* _LINUX_ICMP_H */
include/linux/icmpv6.h +14 -0
@@ -46,4 +46,18 @@ extern void icmpv6_flow_init(struct sock *sk,const struct in6_addr *saddr, const struct in6_addr *daddr, int oif); + +static inline bool icmpv6_is_err (int type) +{ +switch (type) { +case ICMPV6_DEST_UNREACH : +case ICMPV6_PKT_TOOBIG : +case ICMPV6_TIME_EXCEED : +case ICMPV6_PARAMPROB : +return true; + } + +return false; +} +#endif
Signature · 1 line
2.23.0
PATCH 2/2 icmp: remove duplicate code
In reply to Matteo CroceThe same code which recognizes ICMP error packets is duplicated several times. Use the icmp_is_err() and icmpv6_is_err() helpers instead, which do the same thing.
ip_multipath_l3_keys() and tcf_nat_act() didn't check for all the error types, assume that they should instead.
--- net/ipv4/netfilter/nf_socket_ipv4.c | 10 +--------- net/ipv4/route.c | 5 +---- net/ipv6/route.c | 5 +---- net/netfilter/nf_conntrack_proto_icmp.c | 6 +----- net/netfilter/xt_HMARK.c | 6 +----- net/sched/act_nat.c | 4 +--- 6 files changed, 6 insertions(+), 30 deletions(-)
net/ipv4/netfilter/nf_socket_ipv4.c +1 -9
@@ -31,16 +31,8 @@ extract_icmp4_fields(const struct sk_buff *skb, u8 *protocol,if (icmph ==NULL )return 1 ; -switch (icmph->type) { -case ICMP_DEST_UNREACH : -case ICMP_SOURCE_QUENCH : -case ICMP_REDIRECT : -case ICMP_TIME_EXCEEDED : -case ICMP_PARAMETERPROB : -break ; -default : +if (!icmp_is_err (icmph->type))return 1 ; - } inside_iph = skb_header_pointer(skb, outside_hdrlen + sizeof(struct icmphdr),
net/ipv4/route.c +1 -4
@@ -1894,10 +1894,7 @@ static void ip_multipath_l3_keys(const struct sk_buff *skb,if (!icmph) goto out; -if (icmph->type !=ICMP_DEST_UNREACH && - icmph->type !=ICMP_REDIRECT && - icmph->type !=ICMP_TIME_EXCEEDED && - icmph->type !=ICMP_PARAMETERPROB ) +if (!icmp_is_err (icmph->type)) goto out; inner_iph = skb_header_pointer(skb,
net/ipv6/route.c +1 -4
@@ -2291,10 +2291,7 @@ static void ip6_multipath_l3_keys(const struct sk_buff *skb,if (!icmph) goto out; -if (icmph->icmp6_type !=ICMPV6_DEST_UNREACH && - icmph->icmp6_type !=ICMPV6_PKT_TOOBIG && - icmph->icmp6_type !=ICMPV6_TIME_EXCEED && - icmph->icmp6_type !=ICMPV6_PARAMPROB ) +if (!icmpv6_is_err (icmph->icmp6_type)) goto out; inner_iph = skb_header_pointer(skb,
net/netfilter/nf_conntrack_proto_icmp.c +1 -5
@@ -235,11 +235,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl, }/* Need to track icmp error message? */ -if (icmph->type !=ICMP_DEST_UNREACH && - icmph->type !=ICMP_SOURCE_QUENCH && - icmph->type !=ICMP_TIME_EXCEEDED && - icmph->type !=ICMP_PARAMETERPROB && - icmph->type !=ICMP_REDIRECT ) +if (!icmp_is_err (icmph->type))return NF_ACCEPT ;memset (&outer_daddr,0 ,sizeof (outer_daddr));
net/netfilter/xt_HMARK.c +1 -5
@@ -239,11 +239,7 @@ static int get_inner_hdr(const struct sk_buff *skb, int iphsz, int *nhoff)return 0 ;/* Error message? */ -if (icmph->type !=ICMP_DEST_UNREACH && - icmph->type !=ICMP_SOURCE_QUENCH && - icmph->type !=ICMP_TIME_EXCEEDED && - icmph->type !=ICMP_PARAMETERPROB && - icmph->type !=ICMP_REDIRECT ) +if (!icmp_is_err (icmph->type))return 0 ; *nhoff += iphsz +sizeof (_ih);
net/sched/act_nat.c +1 -3
@@ -206,9 +206,7 @@ static int tcf_nat_act(struct sk_buff *skb, const struct tc_action *a, icmph = (void *)(skb_network_header (skb) + ihl); -if ((icmph->type !=ICMP_DEST_UNREACH ) && - (icmph->type !=ICMP_TIME_EXCEEDED ) && - (icmph->type !=ICMP_PARAMETERPROB )) +if (!icmp_is_err (icmph->type))break ; if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph) +
Signature · 1 line
2.23.0
David Miller
maintainerFrom: Matteo Croce <[email protected]>
Date: Sat, 2 Nov 2019 01:12:02 +0100
Quoted 2 lines
Remove some duplicate code by moving it in two helper functions. First patch adds the helpers, the second one uses it.
Series applied.