mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6/sit: fix ipip6_tunnel_get_prl return value

Browse Source 
[ Upstream commit adabdd8f6a ]

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

Addresses-Coverity: ("Unused value")
Fixes: 300aaeeaab ("[IPV6] SIT: Add SIOCGETPRL ioctl to get/dump PRL.")
Signed-off-by: katrinzhou <katrinzhou@tencent.com>
Reviewed-by: Eric Dumazet<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: Sasha Levin <sashal@kernel.org>
This commit is contained in:
katrinzhou
2022-06-28 11:50:30 +08:00
committed by Greg Kroah-Hartman
parent 25055da22a
commit f72d410dbf
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv6/sit.c
View File

@@ -321,8 +321,6 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ifreq *ifr)
kcalloc(cmax, sizeof(*kp), GFP_KERNEL | __GFP_NOWARN) : kcalloc(cmax, sizeof(*kp), GFP_KERNEL | __GFP_NOWARN) :
NULL; NULL;
rcu_read_lock();
ca = min(t->prl_count, cmax); ca = min(t->prl_count, cmax);
if (!kp) { if (!kp) {
@@ -338,7 +336,7 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ifreq *ifr)
} }
} }
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;
@@ -350,7 +348,7 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ifreq *ifr)
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;
@@ -359,7 +357,7 @@ out:
ret = -EFAULT; ret = -EFAULT;
kfree(kp); kfree(kp);
out:
return ret; return ret;
} }