Skip to contentSkip to conversation

Remove redundant null check in ah_mt6

PATCH In review Gaurav Singh 2 participants 4 messages Jun 25, 2020 – Jul 29, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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
index 4e15a14435e4..70da2f2ce064 100644
@@ -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
#1 lore raw

Hi 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.

#2 lore raw

PATCH 1/1 netfilter: ip6tables: Remove redundant null checks

In reply to Gaurav Singh

netfilter: 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
index 4e15a14435e4..70da2f2ce064 100644
@@ -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
index fb91eeee4a1e..3aad6439386b 100644
@@ -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
index 467b2a86031b..e7a3fb9355ee 100644
@@ -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
index f633dc84ca3f..733c83d38b30 100644
@@ -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
maintainer Applied
#3 lore raw

Re: [PATCH] netfilter: ip6tables: Remove redundant null checks

Applied, thanks.