Commit 0bd66827 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv4-null-cmp' 



Ian Morris says:

====================
ipv4: coding style - comparisons with NULL

Per the suggestion of Joe Perches, attached is a patch which aligns the
coding style in ipv4 for comparisons with NULL.

The code uses multiple different styles when comparing with NULL (I.e.
x == NULL and !x as well as x != NULL and x). Generally the latter form
is preferred in netdev and so this changes aligns the code to this style.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11a9c782 00db4124

net/ipv4/af_inet.c

+4 −4
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ int inet_listen(struct socket *sock, int backlog) 
		 * shutdown() (rather than close()).

		 */

		if ((sysctl_tcp_fastopen & TFO_SERVER_ENABLE) != 0 &&

		    inet_csk(sk)->icsk_accept_queue.fastopenq == NULL) {

		    !inet_csk(sk)->icsk_accept_queue.fastopenq) {

			if ((sysctl_tcp_fastopen & TFO_SERVER_WO_SOCKOPT1) != 0)

				err = fastopen_init_queue(sk, backlog);

			else if ((sysctl_tcp_fastopen &
@@ -314,11 +314,11 @@ lookup_protocol: 
	answer_flags = answer->flags;

	rcu_read_unlock();



	WARN_ON(answer_prot->slab == NULL);

	WARN_ON(!answer_prot->slab);



	err = -ENOBUFS;

	sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot);

	if (sk == NULL)

	if (!sk)

		goto out;



	err = 0;
@@ -1269,7 +1269,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
		if (udpfrag) {

			iph->id = htons(id);

			iph->frag_off = htons(offset >> 3);

			if (skb->next != NULL)

			if (skb->next)

				iph->frag_off |= htons(IP_MF);

			offset += skb->len - nhoff - ihl;

		} else {

net/ipv4/arp.c

+14 −14
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int arp_constructor(struct neighbour *neigh) 


	rcu_read_lock();

	in_dev = __in_dev_get_rcu(dev);

	if (in_dev == NULL) {

	if (!in_dev) {

		rcu_read_unlock();

		return -EINVAL;

	}
@@ -475,7 +475,7 @@ static inline int arp_fwd_pvlan(struct in_device *in_dev, 
 */



/*

 *	Create an arp packet. If (dest_hw == NULL), we create a broadcast

 *	Create an arp packet. If dest_hw is not set, we create a broadcast

 *	message.

 */

struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
@@ -495,7 +495,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
	 */



	skb = alloc_skb(arp_hdr_len(dev) + hlen + tlen, GFP_ATOMIC);

	if (skb == NULL)

	if (!skb)

		return NULL;



	skb_reserve(skb, hlen);
@@ -503,9 +503,9 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
	arp = (struct arphdr *) skb_put(skb, arp_hdr_len(dev));

	skb->dev = dev;

	skb->protocol = htons(ETH_P_ARP);

	if (src_hw == NULL)

	if (!src_hw)

		src_hw = dev->dev_addr;

	if (dest_hw == NULL)

	if (!dest_hw)

		dest_hw = dev->broadcast;



	/*
@@ -569,7 +569,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
		break;

#endif

	default:

		if (target_hw != NULL)

		if (target_hw)

			memcpy(arp_ptr, target_hw, dev->addr_len);

		else

			memset(arp_ptr, 0, dev->addr_len);
@@ -614,7 +614,7 @@ void arp_send(int type, int ptype, __be32 dest_ip, 


	skb = arp_create(type, ptype, dest_ip, dev, src_ip,

			 dest_hw, src_hw, target_hw);

	if (skb == NULL)

	if (!skb)

		return;



	arp_xmit(skb);
@@ -644,7 +644,7 @@ static int arp_process(struct sk_buff *skb) 
	 * is ARP'able.

	 */



	if (in_dev == NULL)

	if (!in_dev)

		goto out;



	arp = arp_hdr(skb);
@@ -808,7 +808,7 @@ static int arp_process(struct sk_buff *skb) 
		is_garp = arp->ar_op == htons(ARPOP_REQUEST) && tip == sip &&

			  inet_addr_type(net, sip) == RTN_UNICAST;



		if (n == NULL &&

		if (!n &&

		    ((arp->ar_op == htons(ARPOP_REPLY)  &&

		      inet_addr_type(net, sip) == RTN_UNICAST) || is_garp))

			n = __neigh_lookup(&arp_tbl, &sip, dev, 1);
@@ -900,7 +900,7 @@ out_of_mem: 


static int arp_req_set_proxy(struct net *net, struct net_device *dev, int on)

{

	if (dev == NULL) {

	if (!dev) {

		IPV4_DEVCONF_ALL(net, PROXY_ARP) = on;

		return 0;

	}
@@ -926,7 +926,7 @@ static int arp_req_set_public(struct net *net, struct arpreq *r, 
			return -ENODEV;

	}

	if (mask) {

		if (pneigh_lookup(&arp_tbl, net, &ip, dev, 1) == NULL)

		if (!pneigh_lookup(&arp_tbl, net, &ip, dev, 1))

			return -ENOBUFS;

		return 0;

	}
@@ -947,7 +947,7 @@ static int arp_req_set(struct net *net, struct arpreq *r, 
	ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;

	if (r->arp_flags & ATF_PERM)

		r->arp_flags |= ATF_COM;

	if (dev == NULL) {

	if (!dev) {

		struct rtable *rt = ip_route_output(net, ip, 0, RTO_ONLINK, 0);



		if (IS_ERR(rt))
@@ -1067,7 +1067,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r, 
		return arp_req_delete_public(net, r, dev);



	ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;

	if (dev == NULL) {

	if (!dev) {

		struct rtable *rt = ip_route_output(net, ip, 0, RTO_ONLINK, 0);

		if (IS_ERR(rt))

			return PTR_ERR(rt);
@@ -1116,7 +1116,7 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
	if (r.arp_dev[0]) {

		err = -ENODEV;

		dev = __dev_get_by_name(net, r.arp_dev);

		if (dev == NULL)

		if (!dev)

			goto out;



		/* Mmmm... It is wrong... ARPHRD_NETROM==0 */

net/ipv4/cipso_ipv4.c

+21 −21
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int __init cipso_v4_cache_init(void) 
	cipso_v4_cache = kcalloc(CIPSO_V4_CACHE_BUCKETS,

				 sizeof(struct cipso_v4_map_cache_bkt),

				 GFP_KERNEL);

	if (cipso_v4_cache == NULL)

	if (!cipso_v4_cache)

		return -ENOMEM;



	for (iter = 0; iter < CIPSO_V4_CACHE_BUCKETS; iter++) {
@@ -339,7 +339,7 @@ static int cipso_v4_cache_check(const unsigned char *key, 
			secattr->cache = entry->lsm_data;

			secattr->flags |= NETLBL_SECATTR_CACHE;

			secattr->type = NETLBL_NLTYPE_CIPSOV4;

			if (prev_entry == NULL) {

			if (!prev_entry) {

				spin_unlock_bh(&cipso_v4_cache[bkt].lock);

				return 0;

			}
@@ -393,10 +393,10 @@ int cipso_v4_cache_add(const unsigned char *cipso_ptr, 
	cipso_ptr_len = cipso_ptr[1];



	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);

	if (entry == NULL)

	if (!entry)

		return -ENOMEM;

	entry->key = kmemdup(cipso_ptr, cipso_ptr_len, GFP_ATOMIC);

	if (entry->key == NULL) {

	if (!entry->key) {

		ret_val = -ENOMEM;

		goto cache_add_failure;

	}
@@ -502,7 +502,7 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def, 
	atomic_set(&doi_def->refcount, 1);



	spin_lock(&cipso_v4_doi_list_lock);

	if (cipso_v4_doi_search(doi_def->doi) != NULL) {

	if (cipso_v4_doi_search(doi_def->doi)) {

		spin_unlock(&cipso_v4_doi_list_lock);

		ret_val = -EEXIST;

		goto doi_add_return;
@@ -513,7 +513,7 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def, 


doi_add_return:

	audit_buf = netlbl_audit_start(AUDIT_MAC_CIPSOV4_ADD, audit_info);

	if (audit_buf != NULL) {

	if (audit_buf) {

		const char *type_str;

		switch (doi_type) {

		case CIPSO_V4_MAP_TRANS:
@@ -547,7 +547,7 @@ doi_add_return: 
 */

void cipso_v4_doi_free(struct cipso_v4_doi *doi_def)

{

	if (doi_def == NULL)

	if (!doi_def)

		return;



	switch (doi_def->type) {
@@ -598,7 +598,7 @@ int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info) 


	spin_lock(&cipso_v4_doi_list_lock);

	doi_def = cipso_v4_doi_search(doi);

	if (doi_def == NULL) {

	if (!doi_def) {

		spin_unlock(&cipso_v4_doi_list_lock);

		ret_val = -ENOENT;

		goto doi_remove_return;
@@ -617,7 +617,7 @@ int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info) 


doi_remove_return:

	audit_buf = netlbl_audit_start(AUDIT_MAC_CIPSOV4_DEL, audit_info);

	if (audit_buf != NULL) {

	if (audit_buf) {

		audit_log_format(audit_buf,

				 " cipso_doi=%u res=%u",

				 doi, ret_val == 0 ? 1 : 0);
@@ -644,7 +644,7 @@ struct cipso_v4_doi *cipso_v4_doi_getdef(u32 doi) 


	rcu_read_lock();

	doi_def = cipso_v4_doi_search(doi);

	if (doi_def == NULL)

	if (!doi_def)

		goto doi_getdef_return;

	if (!atomic_inc_not_zero(&doi_def->refcount))

		doi_def = NULL;
@@ -664,7 +664,7 @@ doi_getdef_return: 
 */

void cipso_v4_doi_putdef(struct cipso_v4_doi *doi_def)

{

	if (doi_def == NULL)

	if (!doi_def)

		return;



	if (!atomic_dec_and_test(&doi_def->refcount))
@@ -1642,7 +1642,7 @@ int cipso_v4_validate(const struct sk_buff *skb, unsigned char **option) 


	rcu_read_lock();

	doi_def = cipso_v4_doi_search(get_unaligned_be32(&opt[2]));

	if (doi_def == NULL) {

	if (!doi_def) {

		err_offset = 2;

		goto validate_return_locked;

	}
@@ -1736,7 +1736,7 @@ int cipso_v4_validate(const struct sk_buff *skb, unsigned char **option) 
			 * not the loopback device drop the packet. Further,

			 * there is no legitimate reason for setting this from

			 * userspace so reject it if skb is NULL. */

			if (skb == NULL || !(skb->dev->flags & IFF_LOOPBACK)) {

			if (!skb || !(skb->dev->flags & IFF_LOOPBACK)) {

				err_offset = opt_iter;

				goto validate_return_locked;

			}
@@ -1897,7 +1897,7 @@ int cipso_v4_sock_setattr(struct sock *sk, 
	 * defined yet but it is not a problem as the only users of these

	 * "lite" PF_INET sockets are functions which do an accept() call

	 * afterwards so we will label the socket as part of the accept(). */

	if (sk == NULL)

	if (!sk)

		return 0;



	/* We allocate the maximum CIPSO option size here so we are probably
@@ -1905,7 +1905,7 @@ int cipso_v4_sock_setattr(struct sock *sk, 
	 * on and after all we are only talking about 40 bytes. */

	buf_len = CIPSO_V4_OPT_LEN_MAX;

	buf = kmalloc(buf_len, GFP_ATOMIC);

	if (buf == NULL) {

	if (!buf) {

		ret_val = -ENOMEM;

		goto socket_setattr_failure;

	}
@@ -1921,7 +1921,7 @@ int cipso_v4_sock_setattr(struct sock *sk, 
	 * set the IPOPT_CIPSO option. */

	opt_len = (buf_len + 3) & ~3;

	opt = kzalloc(sizeof(*opt) + opt_len, GFP_ATOMIC);

	if (opt == NULL) {

	if (!opt) {

		ret_val = -ENOMEM;

		goto socket_setattr_failure;

	}
@@ -1981,7 +1981,7 @@ int cipso_v4_req_setattr(struct request_sock *req, 
	 * on and after all we are only talking about 40 bytes. */

	buf_len = CIPSO_V4_OPT_LEN_MAX;

	buf = kmalloc(buf_len, GFP_ATOMIC);

	if (buf == NULL) {

	if (!buf) {

		ret_val = -ENOMEM;

		goto req_setattr_failure;

	}
@@ -1997,7 +1997,7 @@ int cipso_v4_req_setattr(struct request_sock *req, 
	 * set the IPOPT_CIPSO option. */

	opt_len = (buf_len + 3) & ~3;

	opt = kzalloc(sizeof(*opt) + opt_len, GFP_ATOMIC);

	if (opt == NULL) {

	if (!opt) {

		ret_val = -ENOMEM;

		goto req_setattr_failure;

	}
@@ -2102,7 +2102,7 @@ void cipso_v4_sock_delattr(struct sock *sk) 


	sk_inet = inet_sk(sk);

	opt = rcu_dereference_protected(sk_inet->inet_opt, 1);

	if (opt == NULL || opt->opt.cipso == 0)

	if (!opt || opt->opt.cipso == 0)

		return;



	hdr_delta = cipso_v4_delopt(&sk_inet->inet_opt);
@@ -2128,7 +2128,7 @@ void cipso_v4_req_delattr(struct request_sock *req) 


	req_inet = inet_rsk(req);

	opt = req_inet->opt;

	if (opt == NULL || opt->opt.cipso == 0)

	if (!opt || opt->opt.cipso == 0)

		return;



	cipso_v4_delopt(&req_inet->opt);
@@ -2157,7 +2157,7 @@ int cipso_v4_getattr(const unsigned char *cipso, 
	doi = get_unaligned_be32(&cipso[2]);

	rcu_read_lock();

	doi_def = cipso_v4_doi_search(doi);

	if (doi_def == NULL)

	if (!doi_def)

		goto getattr_return;

	/* XXX - This code assumes only one tag per CIPSO option which isn't

	 * really a good assumption to make but since we only support the MAC

net/ipv4/devinet.c

+21 −21
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh) 


	ifm = nlmsg_data(nlh);

	in_dev = inetdev_by_index(net, ifm->ifa_index);

	if (in_dev == NULL) {

	if (!in_dev) {

		err = -ENODEV;

		goto errout;

	}
@@ -755,21 +755,21 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, 


	ifm = nlmsg_data(nlh);

	err = -EINVAL;

	if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL)

	if (ifm->ifa_prefixlen > 32 || !tb[IFA_LOCAL])

		goto errout;



	dev = __dev_get_by_index(net, ifm->ifa_index);

	err = -ENODEV;

	if (dev == NULL)

	if (!dev)

		goto errout;



	in_dev = __in_dev_get_rtnl(dev);

	err = -ENOBUFS;

	if (in_dev == NULL)

	if (!in_dev)

		goto errout;



	ifa = inet_alloc_ifa();

	if (ifa == NULL)

	if (!ifa)

		/*

		 * A potential indev allocation can be left alive, it stays

		 * assigned to its device and is destroy with it.
@@ -780,7 +780,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, 
	neigh_parms_data_state_setall(in_dev->arp_parms);

	in_dev_hold(in_dev);



	if (tb[IFA_ADDRESS] == NULL)

	if (!tb[IFA_ADDRESS])

		tb[IFA_ADDRESS] = tb[IFA_LOCAL];



	INIT_HLIST_NODE(&ifa->hash);
@@ -1290,7 +1290,7 @@ __be32 inet_confirm_addr(struct net *net, struct in_device *in_dev, 
	__be32 addr = 0;

	struct net_device *dev;



	if (in_dev != NULL)

	if (in_dev)

		return confirm_addr_indev(in_dev, dst, local, scope);



	rcu_read_lock();
@@ -1340,7 +1340,7 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev) 
		if (named++ == 0)

			goto skip;

		dot = strchr(old, ':');

		if (dot == NULL) {

		if (!dot) {

			sprintf(old, ":%d", named);

			dot = old;

		}
@@ -1509,7 +1509,7 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa, 
	u32 preferred, valid;



	nlh = nlmsg_put(skb, portid, seq, event, sizeof(*ifm), flags);

	if (nlh == NULL)

	if (!nlh)

		return -EMSGSIZE;



	ifm = nlmsg_data(nlh);
@@ -1628,7 +1628,7 @@ static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh, 


	net = dev_net(ifa->ifa_dev->dev);

	skb = nlmsg_new(inet_nlmsg_size(), GFP_KERNEL);

	if (skb == NULL)

	if (!skb)

		goto errout;



	err = inet_fill_ifaddr(skb, ifa, portid, seq, event, 0);
@@ -1665,7 +1665,7 @@ static int inet_fill_link_af(struct sk_buff *skb, const struct net_device *dev) 
		return -ENODATA;



	nla = nla_reserve(skb, IFLA_INET_CONF, IPV4_DEVCONF_MAX * 4);

	if (nla == NULL)

	if (!nla)

		return -EMSGSIZE;



	for (i = 0; i < IPV4_DEVCONF_MAX; i++)
@@ -1754,7 +1754,7 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex, 


	nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct netconfmsg),

			flags);

	if (nlh == NULL)

	if (!nlh)

		return -EMSGSIZE;



	ncm = nlmsg_data(nlh);
@@ -1796,7 +1796,7 @@ void inet_netconf_notify_devconf(struct net *net, int type, int ifindex, 
	int err = -ENOBUFS;



	skb = nlmsg_new(inet_netconf_msgsize_devconf(type), GFP_ATOMIC);

	if (skb == NULL)

	if (!skb)

		goto errout;



	err = inet_netconf_fill_devconf(skb, ifindex, devconf, 0, 0,
@@ -1853,10 +1853,10 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb, 
		break;

	default:

		dev = __dev_get_by_index(net, ifindex);

		if (dev == NULL)

		if (!dev)

			goto errout;

		in_dev = __in_dev_get_rtnl(dev);

		if (in_dev == NULL)

		if (!in_dev)

			goto errout;

		devconf = &in_dev->cnf;

		break;
@@ -1864,7 +1864,7 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb, 


	err = -ENOBUFS;

	skb = nlmsg_new(inet_netconf_msgsize_devconf(-1), GFP_ATOMIC);

	if (skb == NULL)

	if (!skb)

		goto errout;



	err = inet_netconf_fill_devconf(skb, ifindex, devconf,
@@ -2215,7 +2215,7 @@ static void __devinet_sysctl_unregister(struct ipv4_devconf *cnf) 
{

	struct devinet_sysctl_table *t = cnf->sysctl;



	if (t == NULL)

	if (!t)

		return;



	cnf->sysctl = NULL;
@@ -2276,16 +2276,16 @@ static __net_init int devinet_init_net(struct net *net) 


	if (!net_eq(net, &init_net)) {

		all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);

		if (all == NULL)

		if (!all)

			goto err_alloc_all;



		dflt = kmemdup(dflt, sizeof(ipv4_devconf_dflt), GFP_KERNEL);

		if (dflt == NULL)

		if (!dflt)

			goto err_alloc_dflt;



#ifdef CONFIG_SYSCTL

		tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);

		if (tbl == NULL)

		if (!tbl)

			goto err_alloc_ctl;



		tbl[0].data = &all->data[IPV4_DEVCONF_FORWARDING - 1];
@@ -2305,7 +2305,7 @@ static __net_init int devinet_init_net(struct net *net) 


	err = -ENOMEM;

	forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);

	if (forw_hdr == NULL)

	if (!forw_hdr)

		goto err_reg_ctl;

	net->ipv4.forw_hdr = forw_hdr;

#endif

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static int esp_init_authenc(struct xfrm_state *x) 
	int err;



	err = -EINVAL;

	if (x->ealg == NULL)

	if (!x->ealg)

		goto error;



	err = -ENAMETOOLONG;

CRA Git | Maintained and supported by SUSTech CRA and CCSE