| Message ID | 1362844620-13035-1-git-send-email-minipli@googlemail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Mathias Krause <minipli@googlemail.com> Date: Sat, 9 Mar 2013 16:57:00 +0100 > nla_data() cannot return NULL, so these NULL pointer checks are > superfluous. > > Signed-off-by: Mathias Krause <minipli@googlemail.com> Applied to net-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index aad6435..6f226c8 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c @@ -436,10 +436,7 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh, if (!tb[IFAL_ADDRESS]) return -EINVAL; - pfx = nla_data(tb[IFAL_ADDRESS]); - if (!pfx) - return -EINVAL; if (!tb[IFAL_LABEL]) return -EINVAL; @@ -561,10 +558,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr* nlh, if (!tb[IFAL_ADDRESS]) return -EINVAL; - addr = nla_data(tb[IFAL_ADDRESS]); - if (!addr) - return -EINVAL; rcu_read_lock(); p = __ipv6_addr_label(net, addr, ipv6_addr_type(addr), ifal->ifal_index);
nla_data() cannot return NULL, so these NULL pointer checks are superfluous. Signed-off-by: Mathias Krause <minipli@googlemail.com> --- net/ipv6/addrlabel.c | 6 ------ 1 file changed, 6 deletions(-)