| Message ID | 20200625024605.2881-1-gaurav1086@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net/ipv6] Remove redundant null check in hbh_mt6 | expand |
diff --git a/net/ipv6/netfilter/ip6t_hbh.c b/net/ipv6/netfilter/ip6t_hbh.c index 467b2a86031b..e7a3fb9355ee 100644 --- a/net/ipv6/netfilter/ip6t_hbh.c +++ b/net/ipv6/netfilter/ip6t_hbh.c @@ -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)));
oh cannot be NULL since its already checked above after assignment and is being dereferenced before. Remove the redundant null check. Signed-off-by: Gaurav Singh <gaurav1086@gmail.com> --- net/ipv6/netfilter/ip6t_hbh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)