GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 23:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: streamline __sys_setsockopt

Browse source 
Return early when sockfd_lookup_light fails to reduce a level of
indentation for most of the function body.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-07-17 08:23:11 +02:00 • committed by David S. Miller
parent a06d30ae7a
commit 4a3672993f
1 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

23
net/socket.c
View file

@ -2107,18 +2107,18 @@ static int __sys_setsockopt(int fd, int level, int optname,
return -EINVAL; return -EINVAL;
sock = sockfd_lookup_light(fd, &err, &fput_needed); sock = sockfd_lookup_light(fd, &err, &fput_needed);
if (sock != NULL) { if (!sock)
return err;
err = security_socket_setsockopt(sock, level, optname); err = security_socket_setsockopt(sock, level, optname);
if (err) if (err)
goto out_put; goto out_put;
err = BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock->sk, &level, err = BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock->sk, &level, &optname,
&optname, optval, &optlen, optval, &optlen, &kernel_optval);
&kernel_optval); if (err < 0)
if (err < 0) {
goto out_put; goto out_put;
} else if (err > 0) { if (err > 0) {
err = 0; err = 0;
goto out_put; goto out_put;
} }
@ -2129,21 +2129,18 @@ static int __sys_setsockopt(int fd, int level, int optname,
} }
if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock)) if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock))
err = err = sock_setsockopt(sock, level, optname, optval, optlen);
sock_setsockopt(sock, level, optname, optval,
optlen);
else else
err = err = sock->ops->setsockopt(sock, level, optname, optval,
sock->ops->setsockopt(sock, level, optname, optval,
optlen); optlen);
if (kernel_optval) { if (kernel_optval) {
set_fs(oldfs); set_fs(oldfs);
kfree(kernel_optval); kfree(kernel_optval);
} }
out_put: out_put:
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
}
return err; return err;
} }