Skip to content

Commit 44d0469

Browse files
Zijian ZhangMartin KaFai Lau
authored andcommitted
bpf: Add sk_is_inet and IS_ICSK check in tls_sw_has_ctx_tx/rx
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: 634f1a7 ("vsock: support sockmap") Fixes: 94531cf ("af_unix: Add unix_stream_proto for sockmap") Signed-off-by: Zijian Zhang <[email protected]> Acked-by: Stanislav Fomichev <[email protected]> Acked-by: Jakub Kicinski <[email protected]> Reviewed-by: Cong Wang <[email protected]> Acked-by: Stefano Garzarella <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin KaFai Lau <[email protected]>
1 parent 6801cf7 commit 44d0469

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

include/net/tls.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,17 +390,25 @@ tls_offload_ctx_tx(const struct tls_context *tls_ctx)
390390

391391
static inline bool tls_sw_has_ctx_tx(const struct sock *sk)
392392
{
393-
struct tls_context *ctx = tls_get_ctx(sk);
393+
struct tls_context *ctx;
394+
395+
if (!sk_is_inet(sk) || !inet_test_bit(IS_ICSK, sk))
396+
return false;
394397

398+
ctx = tls_get_ctx(sk);
395399
if (!ctx)
396400
return false;
397401
return !!tls_sw_ctx_tx(ctx);
398402
}
399403

400404
static inline bool tls_sw_has_ctx_rx(const struct sock *sk)
401405
{
402-
struct tls_context *ctx = tls_get_ctx(sk);
406+
struct tls_context *ctx;
407+
408+
if (!sk_is_inet(sk) || !inet_test_bit(IS_ICSK, sk))
409+
return false;
403410

411+
ctx = tls_get_ctx(sk);
404412
if (!ctx)
405413
return false;
406414
return !!tls_sw_ctx_rx(ctx);

0 commit comments

Comments
 (0)