Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ipv6: coding style: comparison for equality with NULL

The ipv6 code uses a mixture of coding styles. In some instances check for NULL
pointer is done as x == NULL and sometimes as !x. !x is preferred according to
checkpatch and this patch makes the code consistent by adopting the latter
form.

No changes detected by objdiff.

Signed-off-by: Ian Morris <ipm@chirality.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Ian Morris and committed by
David S. Miller
63159f29 bc48878c

+173 -174
+44 -44
net/ipv6/addrconf.c
··· 334 334 return ERR_PTR(-EINVAL); 335 335 336 336 ndev = kzalloc(sizeof(struct inet6_dev), GFP_KERNEL); 337 - if (ndev == NULL) 337 + if (!ndev) 338 338 return ERR_PTR(err); 339 339 340 340 rwlock_init(&ndev->lock); ··· 346 346 ndev->cnf.mtu6 = dev->mtu; 347 347 ndev->cnf.sysctl = NULL; 348 348 ndev->nd_parms = neigh_parms_alloc(dev, &nd_tbl); 349 - if (ndev->nd_parms == NULL) { 349 + if (!ndev->nd_parms) { 350 350 kfree(ndev); 351 351 return ERR_PTR(err); 352 352 } ··· 481 481 482 482 nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct netconfmsg), 483 483 flags); 484 - if (nlh == NULL) 484 + if (!nlh) 485 485 return -EMSGSIZE; 486 486 487 487 ncm = nlmsg_data(nlh); ··· 519 519 int err = -ENOBUFS; 520 520 521 521 skb = nlmsg_new(inet6_netconf_msgsize_devconf(type), GFP_ATOMIC); 522 - if (skb == NULL) 522 + if (!skb) 523 523 goto errout; 524 524 525 525 err = inet6_netconf_fill_devconf(skb, ifindex, devconf, 0, 0, ··· 574 574 break; 575 575 default: 576 576 dev = __dev_get_by_index(net, ifindex); 577 - if (dev == NULL) 577 + if (!dev) 578 578 goto errout; 579 579 in6_dev = __in6_dev_get(dev); 580 - if (in6_dev == NULL) 580 + if (!in6_dev) 581 581 goto errout; 582 582 devconf = &in6_dev->cnf; 583 583 break; ··· 585 585 586 586 err = -ENOBUFS; 587 587 skb = nlmsg_new(inet6_netconf_msgsize_devconf(-1), GFP_ATOMIC); 588 - if (skb == NULL) 588 + if (!skb) 589 589 goto errout; 590 590 591 591 err = inet6_netconf_fill_devconf(skb, ifindex, devconf, ··· 854 854 855 855 ifa = kzalloc(sizeof(struct inet6_ifaddr), GFP_ATOMIC); 856 856 857 - if (ifa == NULL) { 857 + if (!ifa) { 858 858 ADBG("ipv6_add_addr: malloc failed\n"); 859 859 err = -ENOBUFS; 860 860 goto out; ··· 1558 1558 : ifp->flags; 1559 1559 if (ipv6_addr_equal(&ifp->addr, addr) && 1560 1560 !(ifp_flags&banned_flags) && 1561 - (dev == NULL || ifp->idev->dev == dev || 1561 + (!dev || ifp->idev->dev == dev || 1562 1562 !(ifp->scope&(IFA_LINK|IFA_HOST) || strict))) { 1563 1563 rcu_read_unlock_bh(); 1564 1564 return 1; ··· 1580 1580 if (!net_eq(dev_net(ifp->idev->dev), net)) 1581 1581 continue; 1582 1582 if (ipv6_addr_equal(&ifp->addr, addr)) { 1583 - if (dev == NULL || ifp->idev->dev == dev) 1583 + if (!dev || ifp->idev->dev == dev) 1584 1584 return true; 1585 1585 } 1586 1586 } ··· 1649 1649 if (!net_eq(dev_net(ifp->idev->dev), net)) 1650 1650 continue; 1651 1651 if (ipv6_addr_equal(&ifp->addr, addr)) { 1652 - if (dev == NULL || ifp->idev->dev == dev || 1652 + if (!dev || ifp->idev->dev == dev || 1653 1653 !(ifp->scope&(IFA_LINK|IFA_HOST) || strict)) { 1654 1654 result = ifp; 1655 1655 in6_ifa_hold(ifp); ··· 2114 2114 struct fib6_table *table; 2115 2115 2116 2116 table = fib6_get_table(dev_net(dev), RT6_TABLE_PREFIX); 2117 - if (table == NULL) 2117 + if (!table) 2118 2118 return NULL; 2119 2119 2120 2120 read_lock_bh(&table->tb6_lock); ··· 2278 2278 2279 2279 in6_dev = in6_dev_get(dev); 2280 2280 2281 - if (in6_dev == NULL) { 2281 + if (!in6_dev) { 2282 2282 net_dbg_ratelimited("addrconf: device %s not configured\n", 2283 2283 dev->name); 2284 2284 return; ··· 2377 2377 2378 2378 ifp = ipv6_get_ifaddr(net, &addr, dev, 1); 2379 2379 2380 - if (ifp == NULL && valid_lft) { 2380 + if (!ifp && valid_lft) { 2381 2381 int max_addresses = in6_dev->cnf.max_addresses; 2382 2382 2383 2383 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD ··· 2486 2486 dev = __dev_get_by_index(net, ireq.ifr6_ifindex); 2487 2487 2488 2488 err = -ENODEV; 2489 - if (dev == NULL) 2489 + if (!dev) 2490 2490 goto err_exit; 2491 2491 2492 2492 #if IS_ENABLED(CONFIG_IPV6_SIT) ··· 2658 2658 return -ENODEV; 2659 2659 2660 2660 idev = __in6_dev_get(dev); 2661 - if (idev == NULL) 2661 + if (!idev) 2662 2662 return -ENXIO; 2663 2663 2664 2664 read_lock_bh(&idev->lock); ··· 2810 2810 ASSERT_RTNL(); 2811 2811 2812 2812 idev = ipv6_find_idev(dev); 2813 - if (idev == NULL) { 2813 + if (!idev) { 2814 2814 pr_debug("%s: add_dev failed\n", __func__); 2815 2815 return; 2816 2816 } ··· 3019 3019 */ 3020 3020 3021 3021 idev = ipv6_find_idev(dev); 3022 - if (idev == NULL) { 3022 + if (!idev) { 3023 3023 pr_debug("%s: add_dev failed\n", __func__); 3024 3024 return; 3025 3025 } ··· 3044 3044 ASSERT_RTNL(); 3045 3045 3046 3046 idev = ipv6_find_idev(dev); 3047 - if (idev == NULL) { 3047 + if (!idev) { 3048 3048 pr_debug("%s: add_dev failed\n", __func__); 3049 3049 return; 3050 3050 } ··· 3241 3241 neigh_ifdown(&nd_tbl, dev); 3242 3242 3243 3243 idev = __in6_dev_get(dev); 3244 - if (idev == NULL) 3244 + if (!idev) 3245 3245 return -ENODEV; 3246 3246 3247 3247 /* ··· 3996 3996 3997 3997 ifm = nlmsg_data(nlh); 3998 3998 pfx = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &peer_pfx); 3999 - if (pfx == NULL) 3999 + if (!pfx) 4000 4000 return -EINVAL; 4001 4001 4002 4002 ifa_flags = tb[IFA_FLAGS] ? nla_get_u32(tb[IFA_FLAGS]) : ifm->ifa_flags; ··· 4108 4108 4109 4109 ifm = nlmsg_data(nlh); 4110 4110 pfx = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &peer_pfx); 4111 - if (pfx == NULL) 4111 + if (!pfx) 4112 4112 return -EINVAL; 4113 4113 4114 4114 if (tb[IFA_CACHEINFO]) { ··· 4123 4123 } 4124 4124 4125 4125 dev = __dev_get_by_index(net, ifm->ifa_index); 4126 - if (dev == NULL) 4126 + if (!dev) 4127 4127 return -ENODEV; 4128 4128 4129 4129 ifa_flags = tb[IFA_FLAGS] ? nla_get_u32(tb[IFA_FLAGS]) : ifm->ifa_flags; ··· 4133 4133 IFA_F_NOPREFIXROUTE | IFA_F_MCAUTOJOIN; 4134 4134 4135 4135 ifa = ipv6_get_ifaddr(net, pfx, dev, 1); 4136 - if (ifa == NULL) { 4136 + if (!ifa) { 4137 4137 /* 4138 4138 * It would be best to check for !NLM_F_CREATE here but 4139 4139 * userspace already relies on not having to provide this. ··· 4208 4208 u32 preferred, valid; 4209 4209 4210 4210 nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags); 4211 - if (nlh == NULL) 4211 + if (!nlh) 4212 4212 return -EMSGSIZE; 4213 4213 4214 4214 put_ifaddrmsg(nlh, ifa->prefix_len, ifa->flags, rt_scope(ifa->scope), ··· 4269 4269 scope = RT_SCOPE_SITE; 4270 4270 4271 4271 nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags); 4272 - if (nlh == NULL) 4272 + if (!nlh) 4273 4273 return -EMSGSIZE; 4274 4274 4275 4275 put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex); ··· 4295 4295 scope = RT_SCOPE_SITE; 4296 4296 4297 4297 nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct ifaddrmsg), flags); 4298 - if (nlh == NULL) 4298 + if (!nlh) 4299 4299 return -EMSGSIZE; 4300 4300 4301 4301 put_ifaddrmsg(nlh, 128, IFA_F_PERMANENT, scope, ifindex); ··· 4468 4468 goto errout; 4469 4469 4470 4470 addr = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &peer); 4471 - if (addr == NULL) { 4471 + if (!addr) { 4472 4472 err = -EINVAL; 4473 4473 goto errout; 4474 4474 } ··· 4511 4511 int err = -ENOBUFS; 4512 4512 4513 4513 skb = nlmsg_new(inet6_ifaddr_msgsize(), GFP_ATOMIC); 4514 - if (skb == NULL) 4514 + if (!skb) 4515 4515 goto errout; 4516 4516 4517 4517 err = inet6_fill_ifaddr(skb, ifa, 0, 0, event, 0); ··· 4664 4664 if (nla_put(skb, IFLA_INET6_CACHEINFO, sizeof(ci), &ci)) 4665 4665 goto nla_put_failure; 4666 4666 nla = nla_reserve(skb, IFLA_INET6_CONF, DEVCONF_MAX * sizeof(s32)); 4667 - if (nla == NULL) 4667 + if (!nla) 4668 4668 goto nla_put_failure; 4669 4669 ipv6_store_devconf(&idev->cnf, nla_data(nla), nla_len(nla)); 4670 4670 4671 4671 /* XXX - MC not implemented */ 4672 4672 4673 4673 nla = nla_reserve(skb, IFLA_INET6_STATS, IPSTATS_MIB_MAX * sizeof(u64)); 4674 - if (nla == NULL) 4674 + if (!nla) 4675 4675 goto nla_put_failure; 4676 4676 snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_STATS, nla_len(nla)); 4677 4677 4678 4678 nla = nla_reserve(skb, IFLA_INET6_ICMP6STATS, ICMP6_MIB_MAX * sizeof(u64)); 4679 - if (nla == NULL) 4679 + if (!nla) 4680 4680 goto nla_put_failure; 4681 4681 snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_ICMP6STATS, nla_len(nla)); 4682 4682 4683 4683 nla = nla_reserve(skb, IFLA_INET6_TOKEN, sizeof(struct in6_addr)); 4684 - if (nla == NULL) 4684 + if (!nla) 4685 4685 goto nla_put_failure; 4686 4686 4687 4687 if (nla_put_u8(skb, IFLA_INET6_ADDR_GEN_MODE, idev->addr_gen_mode)) ··· 4727 4727 4728 4728 ASSERT_RTNL(); 4729 4729 4730 - if (token == NULL) 4730 + if (!token) 4731 4731 return -EINVAL; 4732 4732 if (ipv6_addr_any(token)) 4733 4733 return -EINVAL; ··· 4843 4843 void *protoinfo; 4844 4844 4845 4845 nlh = nlmsg_put(skb, portid, seq, event, sizeof(*hdr), flags); 4846 - if (nlh == NULL) 4846 + if (!nlh) 4847 4847 return -EMSGSIZE; 4848 4848 4849 4849 hdr = nlmsg_data(nlh); ··· 4862 4862 nla_put_u32(skb, IFLA_LINK, dev->iflink))) 4863 4863 goto nla_put_failure; 4864 4864 protoinfo = nla_nest_start(skb, IFLA_PROTINFO); 4865 - if (protoinfo == NULL) 4865 + if (!protoinfo) 4866 4866 goto nla_put_failure; 4867 4867 4868 4868 if (inet6_fill_ifla6_attrs(skb, idev) < 0) ··· 4923 4923 int err = -ENOBUFS; 4924 4924 4925 4925 skb = nlmsg_new(inet6_if_nlmsg_size(), GFP_ATOMIC); 4926 - if (skb == NULL) 4926 + if (!skb) 4927 4927 goto errout; 4928 4928 4929 4929 err = inet6_fill_ifinfo(skb, idev, 0, 0, event, 0); ··· 4956 4956 struct prefix_cacheinfo ci; 4957 4957 4958 4958 nlh = nlmsg_put(skb, portid, seq, event, sizeof(*pmsg), flags); 4959 - if (nlh == NULL) 4959 + if (!nlh) 4960 4960 return -EMSGSIZE; 4961 4961 4962 4962 pmsg = nlmsg_data(nlh); ··· 4995 4995 int err = -ENOBUFS; 4996 4996 4997 4997 skb = nlmsg_new(inet6_prefix_nlmsg_size(), GFP_ATOMIC); 4998 - if (skb == NULL) 4998 + if (!skb) 4999 4999 goto errout; 5000 5000 5001 5001 err = inet6_fill_prefix(skb, idev, pinfo, 0, 0, event, 0); ··· 5596 5596 char path[sizeof("net/ipv6/conf/") + IFNAMSIZ]; 5597 5597 5598 5598 t = kmemdup(&addrconf_sysctl, sizeof(*t), GFP_KERNEL); 5599 - if (t == NULL) 5599 + if (!t) 5600 5600 goto out; 5601 5601 5602 5602 for (i = 0; t->addrconf_vars[i].data; i++) { ··· 5608 5608 snprintf(path, sizeof(path), "net/ipv6/conf/%s", dev_name); 5609 5609 5610 5610 t->sysctl_header = register_net_sysctl(net, path, t->addrconf_vars); 5611 - if (t->sysctl_header == NULL) 5611 + if (!t->sysctl_header) 5612 5612 goto free; 5613 5613 5614 5614 p->sysctl = t; ··· 5624 5624 { 5625 5625 struct addrconf_sysctl_table *t; 5626 5626 5627 - if (p->sysctl == NULL) 5627 + if (!p->sysctl) 5628 5628 return; 5629 5629 5630 5630 t = p->sysctl; ··· 5667 5667 struct ipv6_devconf *all, *dflt; 5668 5668 5669 5669 all = kmemdup(&ipv6_devconf, sizeof(ipv6_devconf), GFP_KERNEL); 5670 - if (all == NULL) 5670 + if (!all) 5671 5671 goto err_alloc_all; 5672 5672 5673 5673 dflt = kmemdup(&ipv6_devconf_dflt, sizeof(ipv6_devconf_dflt), GFP_KERNEL); 5674 - if (dflt == NULL) 5674 + if (!dflt) 5675 5675 goto err_alloc_dflt; 5676 5676 5677 5677 /* these will be inherited by all namespaces */
+4 -4
net/ipv6/af_inet6.c
··· 164 164 answer_flags = answer->flags; 165 165 rcu_read_unlock(); 166 166 167 - WARN_ON(answer_prot->slab == NULL); 167 + WARN_ON(!answer_prot->slab); 168 168 169 169 err = -ENOBUFS; 170 170 sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot); 171 - if (sk == NULL) 171 + if (!sk) 172 172 goto out; 173 173 174 174 sock_init_data(sock, sk); ··· 391 391 { 392 392 struct sock *sk = sock->sk; 393 393 394 - if (sk == NULL) 394 + if (!sk) 395 395 return -EINVAL; 396 396 397 397 /* Free mc lists */ ··· 640 640 641 641 dst = __sk_dst_check(sk, np->dst_cookie); 642 642 643 - if (dst == NULL) { 643 + if (!dst) { 644 644 struct inet_sock *inet = inet_sk(sk); 645 645 struct in6_addr *final_p, final; 646 646 struct flowi6 fl6;
+1 -1
net/ipv6/ah6.c
··· 681 681 goto error; 682 682 683 683 ahp = kzalloc(sizeof(*ahp), GFP_KERNEL); 684 - if (ahp == NULL) 684 + if (!ahp) 685 685 return -ENOMEM; 686 686 687 687 ahash = crypto_alloc_ahash(x->aalg->alg_name, 0, 0);
+5 -5
net/ipv6/anycast.c
··· 70 70 return -EINVAL; 71 71 72 72 pac = sock_kmalloc(sk, sizeof(struct ipv6_ac_socklist), GFP_KERNEL); 73 - if (pac == NULL) 73 + if (!pac) 74 74 return -ENOMEM; 75 75 pac->acl_next = NULL; 76 76 pac->acl_addr = *addr; ··· 93 93 } else 94 94 dev = __dev_get_by_index(net, ifindex); 95 95 96 - if (dev == NULL) { 96 + if (!dev) { 97 97 err = -ENODEV; 98 98 goto error; 99 99 } ··· 222 222 struct ifacaddr6 *aca; 223 223 224 224 aca = kzalloc(sizeof(*aca), GFP_ATOMIC); 225 - if (aca == NULL) 225 + if (!aca) 226 226 return NULL; 227 227 228 228 aca->aca_addr = *addr; ··· 268 268 goto out; 269 269 } 270 270 aca = aca_alloc(rt, addr); 271 - if (aca == NULL) { 271 + if (!aca) { 272 272 ip6_rt_put(rt); 273 273 err = -ENOMEM; 274 274 goto out; ··· 337 337 { 338 338 struct inet6_dev *idev = __in6_dev_get(dev); 339 339 340 - if (idev == NULL) 340 + if (!idev) 341 341 return -ENODEV; 342 342 return __ipv6_dev_ac_dec(idev, addr); 343 343 }
+3 -3
net/ipv6/datagram.c
··· 71 71 fl6.flowlabel = usin->sin6_flowinfo&IPV6_FLOWINFO_MASK; 72 72 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) { 73 73 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 74 - if (flowlabel == NULL) 74 + if (!flowlabel) 75 75 return -EINVAL; 76 76 } 77 77 } ··· 373 373 374 374 err = -EAGAIN; 375 375 skb = sock_dequeue_err_skb(sk); 376 - if (skb == NULL) 376 + if (!skb) 377 377 goto out; 378 378 379 379 copied = skb->len; ··· 463 463 464 464 err = -EAGAIN; 465 465 skb = xchg(&np->rxpmtu, NULL); 466 - if (skb == NULL) 466 + if (!skb) 467 467 goto out; 468 468 469 469 copied = skb->len;
+1 -1
net/ipv6/esp6.c
··· 495 495 int err; 496 496 497 497 err = -EINVAL; 498 - if (x->ealg == NULL) 498 + if (!x->ealg) 499 499 goto error; 500 500 501 501 err = -ENAMETOOLONG;
+5 -5
net/ipv6/exthdrs_core.c
··· 82 82 if (nexthdr == NEXTHDR_NONE) 83 83 return -1; 84 84 hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr); 85 - if (hp == NULL) 85 + if (!hp) 86 86 return -1; 87 87 if (nexthdr == NEXTHDR_FRAGMENT) { 88 88 __be16 _frag_off, *fp; ··· 91 91 frag_off), 92 92 sizeof(_frag_off), 93 93 &_frag_off); 94 - if (fp == NULL) 94 + if (!fp) 95 95 return -1; 96 96 97 97 *frag_offp = *fp; ··· 218 218 } 219 219 220 220 hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr); 221 - if (hp == NULL) 221 + if (!hp) 222 222 return -EBADMSG; 223 223 224 224 if (nexthdr == NEXTHDR_ROUTING) { ··· 226 226 227 227 rh = skb_header_pointer(skb, start, sizeof(_rh), 228 228 &_rh); 229 - if (rh == NULL) 229 + if (!rh) 230 230 return -EBADMSG; 231 231 232 232 if (flags && (*flags & IP6_FH_F_SKIP_RH) && ··· 245 245 frag_off), 246 246 sizeof(_frag_off), 247 247 &_frag_off); 248 - if (fp == NULL) 248 + if (!fp) 249 249 return -EBADMSG; 250 250 251 251 _frag_off = ntohs(*fp) & ~0x7;
+6 -7
net/ipv6/icmp.c
··· 160 160 tp = skb_header_pointer(skb, 161 161 ptr+offsetof(struct icmp6hdr, icmp6_type), 162 162 sizeof(_type), &_type); 163 - if (tp == NULL || 164 - !(*tp & ICMPV6_INFOMSG_MASK)) 163 + if (!tp || !(*tp & ICMPV6_INFOMSG_MASK)) 165 164 return true; 166 165 } 167 166 return false; ··· 230 231 231 232 offset += skb_network_offset(skb); 232 233 op = skb_header_pointer(skb, offset, sizeof(_optval), &_optval); 233 - if (op == NULL) 234 + if (!op) 234 235 return true; 235 236 return (*op & 0xC0) == 0x80; 236 237 } ··· 243 244 int err = 0; 244 245 245 246 skb = skb_peek(&sk->sk_write_queue); 246 - if (skb == NULL) 247 + if (!skb) 247 248 goto out; 248 249 249 250 icmp6h = icmp6_hdr(skb); ··· 478 479 security_skb_classify_flow(skb, flowi6_to_flowi(&fl6)); 479 480 480 481 sk = icmpv6_xmit_lock(net); 481 - if (sk == NULL) 482 + if (!sk) 482 483 return; 483 484 sk->sk_mark = mark; 484 485 np = inet6_sk(sk); ··· 581 582 security_skb_classify_flow(skb, flowi6_to_flowi(&fl6)); 582 583 583 584 sk = icmpv6_xmit_lock(net); 584 - if (sk == NULL) 585 + if (!sk) 585 586 return; 586 587 sk->sk_mark = mark; 587 588 np = inet6_sk(sk); ··· 838 839 839 840 net->ipv6.icmp_sk = 840 841 kzalloc(nr_cpu_ids * sizeof(struct sock *), GFP_KERNEL); 841 - if (net->ipv6.icmp_sk == NULL) 842 + if (!net->ipv6.icmp_sk) 842 843 return -ENOMEM; 843 844 844 845 for_each_possible_cpu(i) {
+8 -8
net/ipv6/ip6_flowlabel.c
··· 205 205 fl->label = htonl(prandom_u32())&IPV6_FLOWLABEL_MASK; 206 206 if (fl->label) { 207 207 lfl = __fl_lookup(net, fl->label); 208 - if (lfl == NULL) 208 + if (!lfl) 209 209 break; 210 210 } 211 211 } ··· 297 297 { 298 298 struct ipv6_txoptions *fl_opt = fl->opt; 299 299 300 - if (fopt == NULL || fopt->opt_flen == 0) 300 + if (!fopt || fopt->opt_flen == 0) 301 301 return fl_opt; 302 302 303 303 if (fl_opt != NULL) { ··· 366 366 367 367 err = -ENOMEM; 368 368 fl = kzalloc(sizeof(*fl), GFP_KERNEL); 369 - if (fl == NULL) 369 + if (!fl) 370 370 goto done; 371 371 372 372 if (olen > 0) { ··· 376 376 377 377 err = -ENOMEM; 378 378 fl->opt = kmalloc(sizeof(*fl->opt) + olen, GFP_KERNEL); 379 - if (fl->opt == NULL) 379 + if (!fl->opt) 380 380 goto done; 381 381 382 382 memset(fl->opt, 0, sizeof(*fl->opt)); ··· 596 596 return -EINVAL; 597 597 598 598 fl = fl_create(net, sk, &freq, optval, optlen, &err); 599 - if (fl == NULL) 599 + if (!fl) 600 600 return err; 601 601 sfl1 = kmalloc(sizeof(*sfl1), GFP_KERNEL); 602 602 ··· 616 616 } 617 617 rcu_read_unlock_bh(); 618 618 619 - if (fl1 == NULL) 619 + if (!fl1) 620 620 fl1 = fl_lookup(net, freq.flr_label); 621 621 if (fl1) { 622 622 recheck: ··· 633 633 goto release; 634 634 635 635 err = -ENOMEM; 636 - if (sfl1 == NULL) 636 + if (!sfl1) 637 637 goto release; 638 638 if (fl->linger > fl1->linger) 639 639 fl1->linger = fl->linger; ··· 653 653 goto done; 654 654 655 655 err = -ENOMEM; 656 - if (sfl1 == NULL) 656 + if (!sfl1) 657 657 goto done; 658 658 659 659 err = mem_check(sk);
+4 -4
net/ipv6/ip6_gre.c
··· 395 395 flags & GRE_KEY ? 396 396 *(((__be32 *)p) + (grehlen / 4) - 1) : 0, 397 397 p[1]); 398 - if (t == NULL) 398 + if (!t) 399 399 return; 400 400 401 401 switch (type) { ··· 980 980 &p->raddr, &p->laddr, 981 981 p->link, strict); 982 982 983 - if (rt == NULL) 983 + if (!rt) 984 984 return; 985 985 986 986 if (rt->dst.dev) { ··· 1073 1073 } 1074 1074 ip6gre_tnl_parm_from_user(&p1, &p); 1075 1075 t = ip6gre_tunnel_locate(net, &p1, 0); 1076 - if (t == NULL) 1076 + if (!t) 1077 1077 t = netdev_priv(dev); 1078 1078 } 1079 1079 memset(&p, 0, sizeof(p)); ··· 1144 1144 err = -ENOENT; 1145 1145 ip6gre_tnl_parm_from_user(&p1, &p); 1146 1146 t = ip6gre_tunnel_locate(net, &p1, 0); 1147 - if (t == NULL) 1147 + if (!t) 1148 1148 goto done; 1149 1149 err = -EPERM; 1150 1150 if (t == netdev_priv(ign->fb_tunnel_dev))
+11 -11
net/ipv6/ip6_output.c
··· 177 177 178 178 if (skb_headroom(skb) < head_room) { 179 179 struct sk_buff *skb2 = skb_realloc_headroom(skb, head_room); 180 - if (skb2 == NULL) { 180 + if (!skb2) { 181 181 IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), 182 182 IPSTATS_MIB_OUTDISCARDS); 183 183 kfree_skb(skb); ··· 823 823 const struct in6_addr *addr_cache) 824 824 { 825 825 return (rt_key->plen != 128 || !ipv6_addr_equal(fl_addr, &rt_key->addr)) && 826 - (addr_cache == NULL || !ipv6_addr_equal(fl_addr, addr_cache)); 826 + (!addr_cache || !ipv6_addr_equal(fl_addr, addr_cache)); 827 827 } 828 828 829 829 static struct dst_entry *ip6_sk_dst_check(struct sock *sk, ··· 882 882 #endif 883 883 int err; 884 884 885 - if (*dst == NULL) 885 + if (!*dst) 886 886 *dst = ip6_route_output(net, sk, fl6); 887 887 888 888 err = (*dst)->error; ··· 1045 1045 * udp datagram 1046 1046 */ 1047 1047 skb = skb_peek_tail(queue); 1048 - if (skb == NULL) { 1048 + if (!skb) { 1049 1049 skb = sock_alloc_send_skb(sk, 1050 1050 hh_len + fragheaderlen + transhdrlen + 20, 1051 1051 (flags & MSG_DONTWAIT), &err); 1052 - if (skb == NULL) 1052 + if (!skb) 1053 1053 return err; 1054 1054 1055 1055 /* reserve space for Hardware header */ ··· 1107 1107 unsigned int orig_mtu) 1108 1108 { 1109 1109 if (!(rt->dst.flags & DST_XFRM_TUNNEL)) { 1110 - if (skb == NULL) { 1110 + if (!skb) { 1111 1111 /* first fragment, reserve header_len */ 1112 1112 *mtu = orig_mtu - rt->dst.header_len; 1113 1113 ··· 1139 1139 return -EINVAL; 1140 1140 1141 1141 v6_cork->opt = kzalloc(opt->tot_len, sk->sk_allocation); 1142 - if (unlikely(v6_cork->opt == NULL)) 1142 + if (unlikely(!v6_cork->opt)) 1143 1143 return -ENOBUFS; 1144 1144 1145 1145 v6_cork->opt->tot_len = opt->tot_len; ··· 1331 1331 else 1332 1332 fraggap = 0; 1333 1333 /* update mtu and maxfraglen if necessary */ 1334 - if (skb == NULL || skb_prev == NULL) 1334 + if (!skb || !skb_prev) 1335 1335 ip6_append_data_mtu(&mtu, &maxfraglen, 1336 1336 fragheaderlen, skb, rt, 1337 1337 orig_mtu); ··· 1383 1383 skb = sock_wmalloc(sk, 1384 1384 alloclen + hh_len, 1, 1385 1385 sk->sk_allocation); 1386 - if (unlikely(skb == NULL)) 1386 + if (unlikely(!skb)) 1387 1387 err = -ENOBUFS; 1388 1388 } 1389 - if (skb == NULL) 1389 + if (!skb) 1390 1390 goto error; 1391 1391 /* 1392 1392 * Fill in the control structures ··· 1578 1578 unsigned char proto = fl6->flowi6_proto; 1579 1579 1580 1580 skb = __skb_dequeue(queue); 1581 - if (skb == NULL) 1581 + if (!skb) 1582 1582 goto out; 1583 1583 tail_skb = &(skb_shinfo(skb)->frag_list); 1584 1584
+4 -4
net/ipv6/ip6_tunnel.c
··· 131 131 struct dst_entry *dst = t->dst_cache; 132 132 133 133 if (dst && dst->obsolete && 134 - dst->ops->check(dst, t->dst_cookie) == NULL) { 134 + !dst->ops->check(dst, t->dst_cookie)) { 135 135 t->dst_cache = NULL; 136 136 dst_release(dst); 137 137 return NULL; ··· 325 325 326 326 dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN, 327 327 ip6_tnl_dev_setup); 328 - if (dev == NULL) 328 + if (!dev) 329 329 goto failed; 330 330 331 331 dev_net_set(dev, net); ··· 496 496 497 497 rcu_read_lock(); 498 498 t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->daddr, &ipv6h->saddr); 499 - if (t == NULL) 499 + if (!t) 500 500 goto out; 501 501 502 502 tproto = ACCESS_ONCE(t->parms.proto); ··· 1274 1274 &p->raddr, &p->laddr, 1275 1275 p->link, strict); 1276 1276 1277 - if (rt == NULL) 1277 + if (!rt) 1278 1278 return; 1279 1279 1280 1280 if (rt->dst.dev) {
+3 -3
net/ipv6/ip6_vti.c
··· 218 218 sprintf(name, "ip6_vti%%d"); 219 219 220 220 dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN, vti6_dev_setup); 221 - if (dev == NULL) 221 + if (!dev) 222 222 goto failed; 223 223 224 224 dev_net_set(dev, net); ··· 716 716 } else { 717 717 memset(&p, 0, sizeof(p)); 718 718 } 719 - if (t == NULL) 719 + if (!t) 720 720 t = netdev_priv(dev); 721 721 vti6_parm_to_user(&p, &t->parms); 722 722 if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p))) ··· 767 767 err = -ENOENT; 768 768 vti6_parm_from_user(&p1, &p); 769 769 t = vti6_locate(net, &p1, 0); 770 - if (t == NULL) 770 + if (!t) 771 771 break; 772 772 err = -EPERM; 773 773 if (t->dev == ip6n->fb_tnl_dev)
+24 -24
net/ipv6/ip6mr.c
··· 173 173 } 174 174 175 175 mrt = ip6mr_get_table(rule->fr_net, rule->table); 176 - if (mrt == NULL) 176 + if (!mrt) 177 177 return -EAGAIN; 178 178 res->mrt = mrt; 179 179 return 0; ··· 237 237 INIT_LIST_HEAD(&net->ipv6.mr6_tables); 238 238 239 239 mrt = ip6mr_new_table(net, RT6_TABLE_DFLT); 240 - if (mrt == NULL) { 240 + if (!mrt) { 241 241 err = -ENOMEM; 242 242 goto err1; 243 243 } ··· 309 309 return mrt; 310 310 311 311 mrt = kzalloc(sizeof(*mrt), GFP_KERNEL); 312 - if (mrt == NULL) 312 + if (!mrt) 313 313 return NULL; 314 314 mrt->id = id; 315 315 write_pnet(&mrt->net, net); ··· 408 408 struct mr6_table *mrt; 409 409 410 410 mrt = ip6mr_get_table(net, RT6_TABLE_DFLT); 411 - if (mrt == NULL) 411 + if (!mrt) 412 412 return ERR_PTR(-ENOENT); 413 413 414 414 iter->mrt = mrt; ··· 492 492 struct mr6_table *mrt; 493 493 494 494 mrt = ip6mr_get_table(net, RT6_TABLE_DFLT); 495 - if (mrt == NULL) 495 + if (!mrt) 496 496 return ERR_PTR(-ENOENT); 497 497 498 498 it->mrt = mrt; ··· 665 665 dev_hold(reg_dev); 666 666 read_unlock(&mrt_lock); 667 667 668 - if (reg_dev == NULL) 668 + if (!reg_dev) 669 669 goto drop; 670 670 671 671 skb->mac_header = skb->network_header; ··· 743 743 sprintf(name, "pim6reg%u", mrt->id); 744 744 745 745 dev = alloc_netdev(0, name, NET_NAME_UNKNOWN, reg_vif_setup); 746 - if (dev == NULL) 746 + if (!dev) 747 747 return NULL; 748 748 749 749 dev_net_set(dev, net); ··· 1072 1072 static struct mfc6_cache *ip6mr_cache_alloc(void) 1073 1073 { 1074 1074 struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); 1075 - if (c == NULL) 1075 + if (!c) 1076 1076 return NULL; 1077 1077 c->mfc_un.res.minvif = MAXMIFS; 1078 1078 return c; ··· 1081 1081 static struct mfc6_cache *ip6mr_cache_alloc_unres(void) 1082 1082 { 1083 1083 struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_ATOMIC); 1084 - if (c == NULL) 1084 + if (!c) 1085 1085 return NULL; 1086 1086 skb_queue_head_init(&c->mfc_un.unres.unresolved); 1087 1087 c->mfc_un.unres.expires = jiffies + 10 * HZ; ··· 1198 1198 skb->ip_summed = CHECKSUM_UNNECESSARY; 1199 1199 } 1200 1200 1201 - if (mrt->mroute6_sk == NULL) { 1201 + if (!mrt->mroute6_sk) { 1202 1202 kfree_skb(skb); 1203 1203 return -EINVAL; 1204 1204 } ··· 1493 1493 return -EINVAL; 1494 1494 1495 1495 c = ip6mr_cache_alloc(); 1496 - if (c == NULL) 1496 + if (!c) 1497 1497 return -ENOMEM; 1498 1498 1499 1499 c->mf6c_origin = mfc->mf6cc_origin.sin6_addr; ··· 1663 1663 struct mr6_table *mrt; 1664 1664 1665 1665 mrt = ip6mr_get_table(net, raw6_sk(sk)->ip6mr_table ? : RT6_TABLE_DFLT); 1666 - if (mrt == NULL) 1666 + if (!mrt) 1667 1667 return -ENOENT; 1668 1668 1669 1669 if (optname != MRT6_INIT) { ··· 1812 1812 struct mr6_table *mrt; 1813 1813 1814 1814 mrt = ip6mr_get_table(net, raw6_sk(sk)->ip6mr_table ? : RT6_TABLE_DFLT); 1815 - if (mrt == NULL) 1815 + if (!mrt) 1816 1816 return -ENOENT; 1817 1817 1818 1818 switch (optname) { ··· 1859 1859 struct mr6_table *mrt; 1860 1860 1861 1861 mrt = ip6mr_get_table(net, raw6_sk(sk)->ip6mr_table ? : RT6_TABLE_DFLT); 1862 - if (mrt == NULL) 1862 + if (!mrt) 1863 1863 return -ENOENT; 1864 1864 1865 1865 switch (cmd) { ··· 1933 1933 struct mr6_table *mrt; 1934 1934 1935 1935 mrt = ip6mr_get_table(net, raw6_sk(sk)->ip6mr_table ? : RT6_TABLE_DFLT); 1936 - if (mrt == NULL) 1936 + if (!mrt) 1937 1937 return -ENOENT; 1938 1938 1939 1939 switch (cmd) { ··· 2003 2003 struct dst_entry *dst; 2004 2004 struct flowi6 fl6; 2005 2005 2006 - if (vif->dev == NULL) 2006 + if (!vif->dev) 2007 2007 goto out_free; 2008 2008 2009 2009 #ifdef CONFIG_IPV6_PIMSM_V2 ··· 2192 2192 read_lock(&mrt_lock); 2193 2193 cache = ip6mr_cache_find(mrt, 2194 2194 &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr); 2195 - if (cache == NULL) { 2195 + if (!cache) { 2196 2196 int vif = ip6mr_find_vif(mrt, skb->dev); 2197 2197 2198 2198 if (vif >= 0) ··· 2204 2204 /* 2205 2205 * No usable cache entry 2206 2206 */ 2207 - if (cache == NULL) { 2207 + if (!cache) { 2208 2208 int vif; 2209 2209 2210 2210 vif = ip6mr_find_vif(mrt, skb->dev); ··· 2243 2243 nla_put_u32(skb, RTA_IIF, mrt->vif6_table[c->mf6c_parent].dev->ifindex) < 0) 2244 2244 return -EMSGSIZE; 2245 2245 mp_attr = nla_nest_start(skb, RTA_MULTIPATH); 2246 - if (mp_attr == NULL) 2246 + if (!mp_attr) 2247 2247 return -EMSGSIZE; 2248 2248 2249 2249 for (ct = c->mfc_un.res.minvif; ct < c->mfc_un.res.maxvif; ct++) { 2250 2250 if (MIF_EXISTS(mrt, ct) && c->mfc_un.res.ttls[ct] < 255) { 2251 2251 nhp = nla_reserve_nohdr(skb, sizeof(*nhp)); 2252 - if (nhp == NULL) { 2252 + if (!nhp) { 2253 2253 nla_nest_cancel(skb, mp_attr); 2254 2254 return -EMSGSIZE; 2255 2255 } ··· 2282 2282 struct rt6_info *rt = (struct rt6_info *)skb_dst(skb); 2283 2283 2284 2284 mrt = ip6mr_get_table(net, RT6_TABLE_DFLT); 2285 - if (mrt == NULL) 2285 + if (!mrt) 2286 2286 return -ENOENT; 2287 2287 2288 2288 read_lock(&mrt_lock); ··· 2307 2307 } 2308 2308 2309 2309 dev = skb->dev; 2310 - if (dev == NULL || (vif = ip6mr_find_vif(mrt, dev)) < 0) { 2310 + if (!dev || (vif = ip6mr_find_vif(mrt, dev)) < 0) { 2311 2311 read_unlock(&mrt_lock); 2312 2312 return -ENODEV; 2313 2313 } ··· 2359 2359 int err; 2360 2360 2361 2361 nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rtm), flags); 2362 - if (nlh == NULL) 2362 + if (!nlh) 2363 2363 return -EMSGSIZE; 2364 2364 2365 2365 rtm = nlmsg_data(nlh); ··· 2424 2424 2425 2425 skb = nlmsg_new(mr6_msgsize(mfc->mf6c_parent >= MAXMIFS, mrt->maxvif), 2426 2426 GFP_ATOMIC); 2427 - if (skb == NULL) 2427 + if (!skb) 2428 2428 goto errout; 2429 2429 2430 2430 err = ip6mr_fill_mroute(mrt, skb, 0, 0, mfc, cmd, 0);
+5 -5
net/ipv6/ipv6_sockglue.c
··· 85 85 return 0; 86 86 } 87 87 } 88 - if (new_ra == NULL) { 88 + if (!new_ra) { 89 89 write_unlock_bh(&ip6_ra_lock); 90 90 return -ENOBUFS; 91 91 } ··· 145 145 int retv = -ENOPROTOOPT; 146 146 bool needs_rtnl = setsockopt_needs_rtnl(optname); 147 147 148 - if (optval == NULL) 148 + if (!optval) 149 149 val = 0; 150 150 else { 151 151 if (optlen >= sizeof(int)) { ··· 392 392 */ 393 393 if (optlen == 0) 394 394 optval = NULL; 395 - else if (optval == NULL) 395 + else if (!optval) 396 396 goto e_inval; 397 397 else if (optlen < sizeof(struct ipv6_opt_hdr) || 398 398 optlen & 0x7 || optlen > 8 * 255) ··· 443 443 444 444 if (optlen == 0) 445 445 goto e_inval; 446 - else if (optlen < sizeof(struct in6_pktinfo) || optval == NULL) 446 + else if (optlen < sizeof(struct in6_pktinfo) || !optval) 447 447 goto e_inval; 448 448 449 449 if (copy_from_user(&pkt, optval, sizeof(struct in6_pktinfo))) { ··· 482 482 483 483 opt = sock_kmalloc(sk, sizeof(*opt) + optlen, GFP_KERNEL); 484 484 retv = -ENOBUFS; 485 - if (opt == NULL) 485 + if (!opt) 486 486 break; 487 487 488 488 memset(opt, 0, sizeof(*opt));
+7 -7
net/ipv6/mcast.c
··· 157 157 158 158 mc_lst = sock_kmalloc(sk, sizeof(struct ipv6_mc_socklist), GFP_KERNEL); 159 159 160 - if (mc_lst == NULL) 160 + if (!mc_lst) 161 161 return -ENOMEM; 162 162 163 163 mc_lst->next = NULL; ··· 173 173 } else 174 174 dev = __dev_get_by_index(net, ifindex); 175 175 176 - if (dev == NULL) { 176 + if (!dev) { 177 177 sock_kfree_s(sk, mc_lst, sizeof(*mc_lst)); 178 178 return -ENODEV; 179 179 } ··· 823 823 struct ifmcaddr6 *mc; 824 824 825 825 mc = kzalloc(sizeof(*mc), GFP_ATOMIC); 826 - if (mc == NULL) 826 + if (!mc) 827 827 return NULL; 828 828 829 829 setup_timer(&mc->mca_timer, igmp6_timer_handler, (unsigned long)mc); ··· 860 860 /* we need to take a reference on idev */ 861 861 idev = in6_dev_get(dev); 862 862 863 - if (idev == NULL) 863 + if (!idev) 864 864 return -EINVAL; 865 865 866 866 write_lock_bh(&idev->lock); ··· 1328 1328 return -EINVAL; 1329 1329 1330 1330 idev = __in6_dev_get(skb->dev); 1331 - if (idev == NULL) 1331 + if (!idev) 1332 1332 return 0; 1333 1333 1334 1334 mld = (struct mld_msg *)icmp6_hdr(skb); ··· 1443 1443 return -EINVAL; 1444 1444 1445 1445 idev = __in6_dev_get(skb->dev); 1446 - if (idev == NULL) 1446 + if (!idev) 1447 1447 return -ENODEV; 1448 1448 1449 1449 /* ··· 1962 1962 1963 1963 skb = sock_alloc_send_skb(sk, hlen + tlen + full_len, 1, &err); 1964 1964 1965 - if (skb == NULL) { 1965 + if (!skb) { 1966 1966 rcu_read_lock(); 1967 1967 IP6_INC_STATS(net, __in6_dev_get(dev), 1968 1968 IPSTATS_MIB_OUTDISCARDS);
+10 -10
net/ipv6/ndisc.c
··· 311 311 bool is_multicast = ipv6_addr_is_multicast(addr); 312 312 313 313 in6_dev = in6_dev_get(dev); 314 - if (in6_dev == NULL) { 314 + if (!in6_dev) { 315 315 return -EINVAL; 316 316 } 317 317 ··· 356 356 struct in6_addr maddr; 357 357 struct net_device *dev = n->dev; 358 358 359 - if (dev == NULL || __in6_dev_get(dev) == NULL) 359 + if (!dev || !__in6_dev_get(dev)) 360 360 return -EINVAL; 361 361 addrconf_addr_solict_mult(addr, &maddr); 362 362 ipv6_dev_mc_inc(dev, &maddr); ··· 369 369 struct in6_addr maddr; 370 370 struct net_device *dev = n->dev; 371 371 372 - if (dev == NULL || __in6_dev_get(dev) == NULL) 372 + if (!dev || !__in6_dev_get(dev)) 373 373 return; 374 374 addrconf_addr_solict_mult(addr, &maddr); 375 375 ipv6_dev_mc_dec(dev, &maddr); ··· 560 560 int optlen = 0; 561 561 struct nd_msg *msg; 562 562 563 - if (saddr == NULL) { 563 + if (!saddr) { 564 564 if (ipv6_get_lladdr(dev, &addr_buf, 565 565 (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC))) 566 566 return; ··· 1030 1030 size_t msg_size = base_size + nla_total_size(sizeof(struct in6_addr)); 1031 1031 1032 1032 skb = nlmsg_new(msg_size, GFP_ATOMIC); 1033 - if (skb == NULL) { 1033 + if (!skb) { 1034 1034 err = -ENOBUFS; 1035 1035 goto errout; 1036 1036 } 1037 1037 1038 1038 nlh = nlmsg_put(skb, 0, 0, RTM_NEWNDUSEROPT, base_size, 0); 1039 - if (nlh == NULL) { 1039 + if (!nlh) { 1040 1040 goto nla_put_failure; 1041 1041 } 1042 1042 ··· 1104 1104 */ 1105 1105 1106 1106 in6_dev = __in6_dev_get(skb->dev); 1107 - if (in6_dev == NULL) { 1107 + if (!in6_dev) { 1108 1108 ND_PRINTK(0, err, "RA: can't find inet6 device for %s\n", 1109 1109 skb->dev->name); 1110 1110 return; ··· 1199 1199 1200 1200 ND_PRINTK(3, info, "RA: rt: %p lifetime: %d, for dev: %s\n", 1201 1201 rt, lifetime, skb->dev->name); 1202 - if (rt == NULL && lifetime) { 1202 + if (!rt && lifetime) { 1203 1203 ND_PRINTK(3, info, "RA: adding default router\n"); 1204 1204 1205 1205 rt = rt6_add_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev, pref); 1206 - if (rt == NULL) { 1206 + if (!rt) { 1207 1207 ND_PRINTK(0, err, 1208 1208 "RA: %s failed to add default route\n", 1209 1209 __func__); ··· 1211 1211 } 1212 1212 1213 1213 neigh = dst_neigh_lookup(&rt->dst, &ipv6_hdr(skb)->saddr); 1214 - if (neigh == NULL) { 1214 + if (!neigh) { 1215 1215 ND_PRINTK(0, err, 1216 1216 "RA: %s got default router without neighbour\n", 1217 1217 __func__);
+5 -5
net/ipv6/raw.c
··· 172 172 read_lock(&raw_v6_hashinfo.lock); 173 173 sk = sk_head(&raw_v6_hashinfo.ht[hash]); 174 174 175 - if (sk == NULL) 175 + if (!sk) 176 176 goto out; 177 177 178 178 net = dev_net(skb->dev); ··· 630 630 skb = sock_alloc_send_skb(sk, 631 631 length + hlen + tlen + 15, 632 632 flags & MSG_DONTWAIT, &err); 633 - if (skb == NULL) 633 + if (!skb) 634 634 goto error; 635 635 skb_reserve(skb, hlen); 636 636 ··· 789 789 fl6.flowlabel = sin6->sin6_flowinfo&IPV6_FLOWINFO_MASK; 790 790 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) { 791 791 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 792 - if (flowlabel == NULL) 792 + if (!flowlabel) 793 793 return -EINVAL; 794 794 } 795 795 } ··· 831 831 } 832 832 if ((fl6.flowlabel&IPV6_FLOWLABEL_MASK) && !flowlabel) { 833 833 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 834 - if (flowlabel == NULL) 834 + if (!flowlabel) 835 835 return -EINVAL; 836 836 } 837 837 if (!(opt->opt_nflen|opt->opt_flen)) 838 838 opt = NULL; 839 839 } 840 - if (opt == NULL) 840 + if (!opt) 841 841 opt = np->opt; 842 842 if (flowlabel) 843 843 opt = fl6_merge_options(&opt_space, flowlabel, opt);
+3 -3
net/ipv6/reassembly.c
··· 430 430 int i, plen = 0; 431 431 432 432 clone = alloc_skb(0, GFP_ATOMIC); 433 - if (clone == NULL) 433 + if (!clone) 434 434 goto out_oom; 435 435 clone->next = head->next; 436 436 head->next = clone; ··· 632 632 table = ip6_frags_ns_ctl_table; 633 633 if (!net_eq(net, &init_net)) { 634 634 table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL); 635 - if (table == NULL) 635 + if (!table) 636 636 goto err_alloc; 637 637 638 638 table[0].data = &net->ipv6.frags.high_thresh; ··· 648 648 } 649 649 650 650 hdr = register_net_sysctl(net, "net/ipv6", table); 651 - if (hdr == NULL) 651 + if (!hdr) 652 652 goto err_reg; 653 653 654 654 net->ipv6.sysctl.frags_hdr = hdr;
+1 -1
net/ipv6/route.c
··· 1476 1476 int remaining; 1477 1477 u32 *mp; 1478 1478 1479 - if (cfg->fc_mx == NULL) 1479 + if (!cfg->fc_mx) 1480 1480 return 0; 1481 1481 1482 1482 mp = kzalloc(sizeof(u32) * RTAX_MAX, GFP_KERNEL);
+6 -6
net/ipv6/sit.c
··· 251 251 252 252 dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN, 253 253 ipip6_tunnel_setup); 254 - if (dev == NULL) 254 + if (!dev) 255 255 return NULL; 256 256 257 257 dev_net_set(dev, net); ··· 555 555 skb->dev, 556 556 iph->daddr, 557 557 iph->saddr); 558 - if (t == NULL) 558 + if (!t) 559 559 goto out; 560 560 561 561 if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { ··· 838 838 if (skb_dst(skb)) 839 839 neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr); 840 840 841 - if (neigh == NULL) { 841 + if (!neigh) { 842 842 net_dbg_ratelimited("nexthop == NULL\n"); 843 843 goto tx_error; 844 844 } ··· 867 867 if (skb_dst(skb)) 868 868 neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr); 869 869 870 - if (neigh == NULL) { 870 + if (!neigh) { 871 871 net_dbg_ratelimited("nexthop == NULL\n"); 872 872 goto tx_error; 873 873 } ··· 1158 1158 break; 1159 1159 } 1160 1160 t = ipip6_tunnel_locate(net, &p, 0); 1161 - if (t == NULL) 1161 + if (!t) 1162 1162 t = netdev_priv(dev); 1163 1163 } 1164 1164 ··· 1242 1242 goto done; 1243 1243 err = -ENOENT; 1244 1244 t = ipip6_tunnel_locate(net, &p, 0); 1245 - if (t == NULL) 1245 + if (!t) 1246 1246 goto done; 1247 1247 err = -EPERM; 1248 1248 if (t == netdev_priv(sitn->fb_tunnel_dev))
+1 -1
net/ipv6/sysctl_net_ipv6.c
··· 179 179 int err = -ENOMEM; 180 180 181 181 ip6_header = register_net_sysctl(&init_net, "net/ipv6", ipv6_rotable); 182 - if (ip6_header == NULL) 182 + if (!ip6_header) 183 183 goto out; 184 184 185 185 err = register_pernet_subsys(&ipv6_sysctl_net_ops);
+6 -6
net/ipv6/tcp_ipv6.c
··· 141 141 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) { 142 142 struct ip6_flowlabel *flowlabel; 143 143 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 144 - if (flowlabel == NULL) 144 + if (!flowlabel) 145 145 return -EINVAL; 146 146 fl6_sock_release(flowlabel); 147 147 } ··· 247 247 goto failure; 248 248 } 249 249 250 - if (saddr == NULL) { 250 + if (!saddr) { 251 251 saddr = &fl6.saddr; 252 252 sk->sk_v6_rcv_saddr = *saddr; 253 253 } ··· 412 412 /* Only in fast or simultaneous open. If a fast open socket is 413 413 * is already accepted it is treated as a connected one below. 414 414 */ 415 - if (fastopen && fastopen->sk == NULL) 415 + if (fastopen && !fastopen->sk) 416 416 break; 417 417 418 418 if (!sock_owned_by_user(sk)) { ··· 750 750 751 751 buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len, 752 752 GFP_ATOMIC); 753 - if (buff == NULL) 753 + if (!buff) 754 754 return; 755 755 756 756 skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len); ··· 1008 1008 1009 1009 newsk = tcp_v4_syn_recv_sock(sk, skb, req, dst); 1010 1010 1011 - if (newsk == NULL) 1011 + if (!newsk) 1012 1012 return NULL; 1013 1013 1014 1014 newtcp6sk = (struct tcp6_sock *)newsk; ··· 1065 1065 } 1066 1066 1067 1067 newsk = tcp_create_openreq_child(sk, req, skb); 1068 - if (newsk == NULL) 1068 + if (!newsk) 1069 1069 goto out_nonewsk; 1070 1070 1071 1071 /*
+5 -5
net/ipv6/udp.c
··· 550 550 551 551 sk = __udp6_lib_lookup(net, daddr, uh->dest, 552 552 saddr, uh->source, inet6_iif(skb), udptable); 553 - if (sk == NULL) { 553 + if (!sk) { 554 554 ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev), 555 555 ICMP6_MIB_INERRORS); 556 556 return; ··· 749 749 750 750 for (i = 0; i < count; i++) { 751 751 sk = stack[i]; 752 - if (likely(skb1 == NULL)) 752 + if (likely(!skb1)) 753 753 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); 754 754 if (!skb1) { 755 755 atomic_inc(&sk->sk_drops); ··· 1207 1207 fl6.flowlabel = sin6->sin6_flowinfo&IPV6_FLOWINFO_MASK; 1208 1208 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) { 1209 1209 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 1210 - if (flowlabel == NULL) 1210 + if (!flowlabel) 1211 1211 return -EINVAL; 1212 1212 } 1213 1213 } ··· 1255 1255 } 1256 1256 if ((fl6.flowlabel&IPV6_FLOWLABEL_MASK) && !flowlabel) { 1257 1257 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 1258 - if (flowlabel == NULL) 1258 + if (!flowlabel) 1259 1259 return -EINVAL; 1260 1260 } 1261 1261 if (!(opt->opt_nflen|opt->opt_flen)) 1262 1262 opt = NULL; 1263 1263 connected = 0; 1264 1264 } 1265 - if (opt == NULL) 1265 + if (!opt) 1266 1266 opt = np->opt; 1267 1267 if (flowlabel) 1268 1268 opt = fl6_merge_options(&opt_space, flowlabel, opt);
+1 -1
net/ipv6/xfrm6_policy.c
··· 370 370 { 371 371 struct ctl_table *table; 372 372 373 - if (net->ipv6.sysctl.xfrm6_hdr == NULL) 373 + if (!net->ipv6.sysctl.xfrm6_hdr) 374 374 return; 375 375 376 376 table = net->ipv6.sysctl.xfrm6_hdr->ctl_table_arg;