Commit 448b5118 authored Nov 06, 2024 by Zijian Zhang Committed by Wen Zhiwei Nov 19, 2024

bpf: Add sk_is_inet and IS_ICSK check in tls_sw_has_ctx_tx/rx

stable inclusion
from stable-v6.6.62
commit a078a480ff3f43d74d8a024ae10c3c7daf6db149
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB5BUT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a078a480ff3f43d74d8a024ae10c3c7daf6db149



--------------------------------

[ Upstream commit 44d0469f79bd3d0b3433732877358df7dc6b17b1 ]

As the introduction of the support for vsock and unix sockets in sockmap,
tls_sw_has_ctx_tx/rx cannot presume the socket passed in must be IS_ICSK.
vsock and af_unix sockets have vsock_sock and unix_sock instead of
inet_connection_sock. For these sockets, tls_get_ctx may return an invalid
pointer and cause page fault in function tls_sw_ctx_rx.

BUG: unable to handle page fault for address: 0000000000040030
Workqueue: vsock-loopback vsock_loopback_work
RIP: 0010:sk_psock_strp_data_ready+0x23/0x60
Call Trace:
 ? __die+0x81/0xc3
 ? no_context+0x194/0x350
 ? do_page_fault+0x30/0x110
 ? async_page_fault+0x3e/0x50
 ? sk_psock_strp_data_ready+0x23/0x60
 virtio_transport_recv_pkt+0x750/0x800
 ? update_load_avg+0x7e/0x620
 vsock_loopback_work+0xd0/0x100
 process_one_work+0x1a7/0x360
 worker_thread+0x30/0x390
 ? create_worker+0x1a0/0x1a0
 kthread+0x112/0x130
 ? __kthread_cancel_work+0x40/0x40
 ret_from_fork+0x1f/0x40

v2:
  - Add IS_ICSK check
v3:
  - Update the commits in Fixes

Fixes: 634f1a71 ("vsock: support sockmap")
Fixes: 94531cfc ("af_unix: Add unix_stream_proto for sockmap")
Signed-off-by: Zijian Zhang <zijianzhang@bytedance.com>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Cong Wang <cong.wang@bytedance.com>
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
Link: https://lore.kernel.org/r/20241106003742.399240-1-zijianzhang@bytedance.com


Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent 6c3b1f08

include/net/tls.h

+10 −2

Original line number	Diff line number	Diff line
		@@ -413,8 +413,12 @@ tls_offload_ctx_tx(const struct tls_context *tls_ctx)

		static inline bool tls_sw_has_ctx_tx(const struct sock *sk)
		{
		struct tls_context *ctx = tls_get_ctx(sk);
		struct tls_context *ctx;

		if (!sk_is_inet(sk) \|\| !inet_test_bit(IS_ICSK, sk))
		return false;

		ctx = tls_get_ctx(sk);
		if (!ctx)
		return false;
		return !!tls_sw_ctx_tx(ctx);
		@@ -422,8 +426,12 @@ static inline bool tls_sw_has_ctx_tx(const struct sock *sk)

		static inline bool tls_sw_has_ctx_rx(const struct sock *sk)
		{
		struct tls_context *ctx = tls_get_ctx(sk);
		struct tls_context *ctx;

		if (!sk_is_inet(sk) \|\| !inet_test_bit(IS_ICSK, sk))
		return false;

		ctx = tls_get_ctx(sk);
		if (!ctx)
		return false;
		return !!tls_sw_ctx_rx(ctx);