2022-06-28 04:08:03

by Katrin Jo

Subject: [PATCH v3] ipv6/sit: fix ipip6_tunnel_get_prl return value

From: katrinzhou <[email protected]>

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 <[email protected]>
---

Changes in v2:
- Move the position of label "out"

Changes in v3:
- Modify commit message

net/ipv6/sit.c | 8 +++-----
1 file 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 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u
ret = -EFAULT;

kfree(kp);
-
+out:
return ret;
}

--
2.27.0

2022-06-28 12:07:52

by Eric Dumazet

Subject: Re: [PATCH v3] ipv6/sit: fix ipip6_tunnel_get_prl return value

On Tue, Jun 28, 2022 at 5:50 AM <[email protected]> wrote:
>
> From: katrinzhou <[email protected]>
>
> 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 <[email protected]>
> ---
>

Reviewed-by: Eric Dumazet<[email protected]>

2022-06-28 15:14:31

by David Ahern

Subject: Re: [PATCH v3] ipv6/sit: fix ipip6_tunnel_get_prl return value

On 6/27/22 9:50 PM, [email protected] wrote:
> From: katrinzhou <[email protected]>
>
> 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 <[email protected]>
> ---
>
> Changes in v2:
> - Move the position of label "out"
>
> Changes in v3:
> - Modify commit message
>
> net/ipv6/sit.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>

Reviewed-by: David Ahern <[email protected]>

2022-06-29 04:14:16

by patchwork-bot+netdevbpf

Subject: Re: [PATCH v3] ipv6/sit: fix ipip6_tunnel_get_prl return value

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Tue, 28 Jun 2022 11:50:30 +0800 you wrote:
> From: katrinzhou <[email protected]>
>
> 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 <[email protected]>
>
> [...]

Here is the summary with links:
- [v3] ipv6/sit: fix ipip6_tunnel_get_prl return value
https://git.kernel.org/netdev/net/c/adabdd8f6aca

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html