]> git.hungrycats.org Git - linux/commitdiff
[IPV6]: Fix two ipv6_addr_addr failure checks.
authorDavid S. Miller <davem@nuts.ninka.net>
Mon, 30 Jun 2003 20:13:04 +0000 (13:13 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 30 Jun 2003 20:13:04 +0000 (13:13 -0700)
net/ipv6/addrconf.c

index c78959ee6847ac08bfbf3fd39d3acc5369bd193e..15a9ce7a3cc1e2d0dcdf5fa60b3fafba033a9a2d 100644 (file)
@@ -702,7 +702,7 @@ retry:
        ift = ipv6_count_addresses(idev) < IPV6_MAX_ADDRESSES ?
                ipv6_add_addr(idev, &addr, tmp_plen,
                              ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, IFA_F_TEMPORARY) : 0;
-       if (IS_ERR(ift)) {
+       if (!ift || IS_ERR(ift)) {
                in6_dev_put(idev);
                in6_ifa_put(ifp);
                printk(KERN_INFO
@@ -1410,7 +1410,7 @@ ok:
                                ifp = ipv6_add_addr(in6_dev, &addr, pinfo->prefix_len,
                                                    addr_type&IPV6_ADDR_SCOPE_MASK, 0);
 
-                       if (IS_ERR(ifp)) {
+                       if (!ifp || IS_ERR(ifp)) {
                                in6_dev_put(in6_dev);
                                return;
                        }