diff options
| author | katrinzhou <katrinzhou@tencent.com> | 2022-06-28 11:50:30 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-07 17:35:11 +0200 |
| commit | 2e837e1d22dbdc4fb7cd2c3fa7d57d913b2ab9e8 (patch) | |
| tree | 555b97a0090e55f21c04748ecb2184ee8c73c9dd /net | |
| parent | c4829dc5ce1ce565db2e00bad89e327a73fe98fc (diff) | |
| download | linux-stable-2e837e1d22dbdc4fb7cd2c3fa7d57d913b2ab9e8.tar.gz linux-stable-2e837e1d22dbdc4fb7cd2c3fa7d57d913b2ab9e8.tar.bz2 linux-stable-2e837e1d22dbdc4fb7cd2c3fa7d57d913b2ab9e8.zip | |
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 0b8a2ea0909f..420b9fcc10d7 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -314,8 +314,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) { @@ -331,7 +329,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; @@ -343,7 +341,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; @@ -352,7 +350,7 @@ out: ret = -EFAULT; kfree(kp); - +out: return ret; } |