diff options
author | katrinzhou <katrinzhou@tencent.com> | 2022-06-28 11:50:30 +0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-28 21:00:34 -0700 |
commit | adabdd8f6acabc0c3fdbba2e7f5a2edd9c5ef22d (patch) | |
tree | 7c8f09c2ca51ec8113785b017bfe2c82b399ee7f /net/ipv6 | |
parent | bce3bb30b266a12fa32d4f08bdaf59a03887f802 (diff) | |
download | linux-stable-adabdd8f6acabc0c3fdbba2e7f5a2edd9c5ef22d.tar.gz linux-stable-adabdd8f6acabc0c3fdbba2e7f5a2edd9c5ef22d.tar.bz2 linux-stable-adabdd8f6acabc0c3fdbba2e7f5a2edd9c5ef22d.zip |
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: 300aaeeaab5f ("[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>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/sit.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index c0b138c20992..6bcd5e419a08 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -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) : NULL; - rcu_read_lock(); - ca = min(t->prl_count, cmax); 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) { if (c >= cmax) 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)) break; } -out: + rcu_read_unlock(); len = sizeof(*kp) * c; @@ -362,7 +360,7 @@ out: ret = -EFAULT; kfree(kp); - +out: return ret; } |