Commit adabdd8f authored by katrinzhou's avatar katrinzhou Committed by Jakub Kicinski
Browse files

ipv6/sit: fix ipip6_tunnel_get_prl return value 



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: default avatarkatrinzhou <katrinzhou@tencent.com>
Reviewed-by: default avatarEric <Dumazet&lt;edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20220628035030.1039171-1-zys.zljxml@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bce3bb30

net/ipv6/sit.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -323,8 +323,6 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u 
		kcalloc(cmax, sizeof(*kp), GFP_KERNEL_ACCOUNT | __GFP_NOWARN) :

		kcalloc(cmax, sizeof(*kp), GFP_KERNEL_ACCOUNT | __GFP_NOWARN) :

		NULL;

		NULL;





	rcu_read_lock();



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

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





	if (!kp) {

	if (!kp) {
@@ -341,7 +339,7 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u 
		}

		}

	}

	}





	c = 0;

	rcu_read_lock();

	for_each_prl_rcu(t->prl) {

	for_each_prl_rcu(t->prl) {

		if (c >= cmax)

		if (c >= cmax)

			break;

			break;
@@ -353,7 +351,7 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u 
		if (kprl.addr != htonl(INADDR_ANY))

		if (kprl.addr != htonl(INADDR_ANY))

			break;

			break;

	}

	}

out:



	rcu_read_unlock();

	rcu_read_unlock();





	len = sizeof(*kp) * c;

	len = sizeof(*kp) * c;
@@ -362,7 +360,7 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u 
		ret = -EFAULT;

		ret = -EFAULT;





	kfree(kp);

	kfree(kp);



out:

	return ret;

	return ret;

}

}