Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50c3a487 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ipv4: Use IS_ERR_OR_NULL(). 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fbcec24

net/ipv4/af_inet.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1333,7 +1333,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
		segs = ops->callbacks.gso_segment(skb, features);

		segs = ops->callbacks.gso_segment(skb, features);

	rcu_read_unlock();

	rcu_read_unlock();





	if (!segs || IS_ERR(segs))

	if (IS_ERR_OR_NULL(segs))

		goto out;

		goto out;





	skb = segs;

	skb = segs;

net/ipv4/tcp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3243,7 +3243,7 @@ __tcp_alloc_md5sig_pool(struct sock *sk) 
		struct crypto_hash *hash;

		struct crypto_hash *hash;





		hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);

		hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);

		if (!hash || IS_ERR(hash))

		if (IS_ERR_OR_NULL(hash))

			goto out_free;

			goto out_free;





		per_cpu_ptr(pool, cpu)->md5_desc.tfm = hash;

		per_cpu_ptr(pool, cpu)->md5_desc.tfm = hash;

net/ipv4/udp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -971,7 +971,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
				  sizeof(struct udphdr), &ipc, &rt,

				  sizeof(struct udphdr), &ipc, &rt,

				  msg->msg_flags);

				  msg->msg_flags);

		err = PTR_ERR(skb);

		err = PTR_ERR(skb);

		if (skb && !IS_ERR(skb))

		if (!IS_ERR_OR_NULL(skb))

			err = udp_send_skb(skb, fl4);

			err = udp_send_skb(skb, fl4);

		goto out;

		goto out;

	}

	}