Skip to content

Commit 3f0a201

Browse files
committed
net, sunrpc: Remap EPERM in case of connection failure in xs_tcp_setup_socket
jira LE-3201 cve CVE-2024-42246 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.22.1.rt7.363.el8_10 commit-author Daniel Borkmann <daniel@iogearbox.net> commit 626dfed When using a BPF program on kernel_connect(), the call can return -EPERM. This causes xs_tcp_setup_socket() to loop forever, filling up the syslog and causing the kernel to potentially freeze up. Neil suggested: This will propagate -EPERM up into other layers which might not be ready to handle it. It might be safer to map EPERM to an error we would be more likely to expect from the network system - such as ECONNREFUSED or ENETDOWN. ECONNREFUSED as error seems reasonable. For programs setting a different error can be out of reach (see handling in 4fbac77) in particular on kernels which do not have f10d059 ("bpf: Make BPF_PROG_RUN_ARRAY return -err instead of allow boolean"), thus given that it is better to simply remap for consistent behavior. UDP does handle EPERM in xs_udp_send_request(). Fixes: d74bad4 ("bpf: Hooks for sys_connect") Fixes: 4fbac77 ("bpf: Hooks for sys_bind") Co-developed-by: Lex Siegel <usiegl00@gmail.com> Signed-off-by: Lex Siegel <usiegl00@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: Neil Brown <neilb@suse.de> Cc: Trond Myklebust <trondmy@kernel.org> Cc: Anna Schumaker <anna@kernel.org> Link: cilium/cilium#33395 Link: https://lore.kernel.org/bpf/171374175513.12877.8993642908082014881@noble.neil.brown.name Link: https://patch.msgid.link/9069ec1d59e4b2129fc23433349fd5580ad43921.1720075070.git.daniel@iogearbox.net Signed-off-by: Paolo Abeni <pabeni@redhat.com> (cherry picked from commit 626dfed) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 4655756 commit 3f0a201

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

net/sunrpc/xprtsock.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,6 +2329,13 @@ static void xs_tcp_setup_socket(struct work_struct *work)
23292329
transport->srcport = 0;
23302330
status = -EAGAIN;
23312331
break;
2332+
case -EPERM:
2333+
/* Happens, for instance, if a BPF program is preventing
2334+
* the connect. Remap the error so upper layers can better
2335+
* deal with it.
2336+
*/
2337+
status = -ECONNREFUSED;
2338+
fallthrough;
23322339
case -EINVAL:
23332340
/* Happens, for instance, if the user specified a link
23342341
* local IPv6 address without a scope-id.

0 commit comments

Comments
 (0)