Commit 778b407b authored Jun 28, 2022 by katrinzhou Committed by Greg Kroah-Hartman Jul 07, 2022

ipv6/sit: fix ipip6_tunnel_get_prl return value



commit adabdd8f6acabc0c3fdbba2e7f5a2edd9c5ef22d upstream.

When kcalloc fails, ipip6_tunnel_get_prl() should return -ENOMEM.
Move the position of label "out" to return correctly.

Addresses-Coverity: ("Unused value")
Fixes: 300aaeea ("[IPV6] SIT: Add SIOCGETPRL ioctl to get/dump PRL.")
Signed-off-by: katrinzhou <katrinzhou@tencent.com>
Reviewed-by: Eric <Dumazet&lt;edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20220628035030.1039171-1-zys.zljxml@gmail.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent de67923f

net/ipv6/sit.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -308,8 +308,6 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
		kcalloc(cmax, sizeof(*kp), GFP_KERNEL \| __GFP_NOWARN) :
		NULL;

		rcu_read_lock();

		ca = min(t->prl_count, cmax);

		if (!kp) {
		@@ -325,7 +323,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
		}
		}

		c = 0;
		rcu_read_lock();
		for_each_prl_rcu(t->prl) {
		if (c >= cmax)
		break;
		@@ -337,7 +335,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
		if (kprl.addr != htonl(INADDR_ANY))
		break;
		}
		out:

		rcu_read_unlock();

		len = sizeof(kp) c;
		@@ -346,7 +344,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
		ret = -EFAULT;

		kfree(kp);

		out:
		return ret;
		}