From patchwork Sat Mar 9 15:57:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: ipv6: remove superfluous nla_data() NULL pointer checks From: Mathias Krause X-Patchwork-Id: 226343 Message-Id: <1362844620-13035-1-git-send-email-minipli@googlemail.com> To: "David S. Miller" Cc: netdev@vger.kernel.org, Mathias Krause 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 --- net/ipv6/addrlabel.c | 6 ------ 1 file changed, 6 deletions(-) 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);