Remove redundant null check in ah_mt6
Subsystems (3)
PATCH 1/1 Remove redundant null check in ah_mt6
ah cannot be NULL since its already checked above after assignment and is being dereferenced before in pr(). Remove the redundant null check.
--- net/ipv6/netfilter/ip6t_ah.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv6/netfilter/ip6t_ah.c +1 -2
@@ -74,8 +74,7 @@ static bool ah_mt6(const struct sk_buff *skb, struct xt_action_param *par) ahinfo->hdrres, ah->reserved, !(ahinfo->hdrres && ah->reserved)); -return (ah !=NULL ) && -spi_match (ahinfo->spis[0 ], ahinfo->spis[1 ], +return spi_match (ahinfo->spis[0 ], ahinfo->spis[1 ],ntohl (ah->spi), !!(ahinfo->invflags & IP6T_AH_INV_SPI)) && (!ahinfo->hdrlen ||
Signature · 1 line
2.17.1
Pablo Neira Ayuso
maintainerHi Gaurav,
Quoted 3 lines · Gaurav Singh
ah cannot be NULL since its already checked above after assignment and is being dereferenced before in
pr(). Remove the redundant null check.
Could you collapse all your patches into one?
They look like the same logic change (patch description is the same in the four patches in the series).
Please, prepend netfilter: to your patch subject, I suggest the following subject for the collapsed patch.
netfilter: ip6tables: Remove redundant null checks
Thanks.
PATCH 1/1 netfilter: ip6tables: Remove redundant null checks
In reply to Gaurav Singhnetfilter: ip6tables: Remove redundant null checks
--- net/ipv6/netfilter/ip6t_ah.c | 3 +-- net/ipv6/netfilter/ip6t_frag.c | 3 +-- net/ipv6/netfilter/ip6t_hbh.c | 3 +-- net/ipv6/netfilter/ip6t_rt.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-)
net/ipv6/netfilter/ip6t_ah.c +1 -2
@@ -74,8 +74,7 @@ static bool ah_mt6(const struct sk_buff *skb, struct xt_action_param *par) ahinfo->hdrres, ah->reserved, !(ahinfo->hdrres && ah->reserved)); -return (ah !=NULL ) && -spi_match (ahinfo->spis[0 ], ahinfo->spis[1 ], +return spi_match (ahinfo->spis[0 ], ahinfo->spis[1 ],ntohl (ah->spi), !!(ahinfo->invflags & IP6T_AH_INV_SPI)) && (!ahinfo->hdrlen ||
net/ipv6/netfilter/ip6t_frag.c +1 -2
@@ -85,8 +85,7 @@ frag_mt6(const struct sk_buff *skb, struct xt_action_param *par) !((fraginfo->flags &IP6T_FRAG_NMF ) && (ntohs(fh->frag_off) & IP6_MF))); -return (fh !=NULL ) && -id_match (fraginfo->ids[0 ], fraginfo->ids[1 ], +return id_match (fraginfo->ids[0 ], fraginfo->ids[1 ],ntohl (fh->identification), !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)) && !((fraginfo->flags & IP6T_FRAG_RES) &&
net/ipv6/netfilter/ip6t_hbh.c +1 -2
@@ -86,8 +86,7 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par) ((optinfo->hdrlen == hdrlen) ^ !!(optinfo->invflags & IP6T_OPTS_INV_LEN)))); - ret = (oh !=NULL ) && - (!(optinfo->flags &IP6T_OPTS_LEN ) || + ret = (!(optinfo->flags &IP6T_OPTS_LEN ) || ((optinfo->hdrlen == hdrlen) ^ !!(optinfo->invflags &IP6T_OPTS_INV_LEN )));
net/ipv6/netfilter/ip6t_rt.c +1 -2
@@ -89,8 +89,7 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par) !((rtinfo->flags &IP6T_RT_RES ) && (((const struct rt0_hdr *)rh)->reserved))); - ret = (rh !=NULL ) && - (segsleft_match (rtinfo->segsleft[0 ], rtinfo->segsleft[1 ], + ret = (segsleft_match (rtinfo->segsleft[0 ], rtinfo->segsleft[1 ], rh->segments_left, !!(rtinfo->invflags & IP6T_RT_INV_SGS))) && (!(rtinfo->flags & IP6T_RT_LEN) ||
Signature · 1 line
2.17.1
Re: [PATCH] netfilter: ip6tables: Remove redundant null checks
Applied, thanks.