| Message ID | 04a018e8-7433-4f67-8ddd-9357a0114f87@moroto.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | afc5625e20971e8294a35b2f284a91b0601f9fce |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] atm: clean up a put_user() calls | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 13 Jun 2024 21:21:42 +0300 you wrote: > Unlike copy_from_user(), put_user() and get_user() return -EFAULT on > error. Use the error code directly instead of setting it. > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > net/atm/ioctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next] atm: clean up a put_user() calls https://git.kernel.org/netdev/net-next/c/afc5625e2097 You are awesome, thank you!
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index f81f8d56f5c0..0f7a39aeccc8 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c @@ -68,7 +68,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, goto done; } error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk), - (int __user *)argp) ? -EFAULT : 0; + (int __user *)argp); goto done; case SIOCINQ: { @@ -83,7 +83,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, skb = skb_peek(&sk->sk_receive_queue); amount = skb ? skb->len : 0; spin_unlock_irq(&sk->sk_receive_queue.lock); - error = put_user(amount, (int __user *)argp) ? -EFAULT : 0; + error = put_user(amount, (int __user *)argp); goto done; } case ATM_SETSC:
Unlike copy_from_user(), put_user() and get_user() return -EFAULT on error. Use the error code directly instead of setting it. Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- net/atm/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)