ksmbd: delete asynchronous work from list
Subsystems (2)
Namjae Jeon
maintainerPATCH 1/1 ksmbd: delete asynchronous work from list
When smb2_lock request is canceled by smb2_cancel or smb2_close(), ksmbd is missing deleting async_request_entry async_requests list. Because calling init_smb2_rsp_hdr() in smb2_lock() mark ->synchronous as true and then it will not be deleted in ksmbd_conn_try_dequeue_request(). This patch add release_async_work() to release the ones allocated for async work.
--- fs/ksmbd/connection.c | 12 +++++------- fs/ksmbd/ksmbd_work.h | 2 +- fs/ksmbd/smb2pdu.c | 33 +++++++++++++++++++++------------ fs/ksmbd/smb2pdu.h | 1 + 4 files changed, 28 insertions(+), 20 deletions(-)
fs/ksmbd/connection.c +5 -7
@@ -112,10 +112,8 @@ void ksmbd_conn_enqueue_request(struct ksmbd_work *work)struct ksmbd_conn *conn = work->conn;struct list_head *requests_queue =NULL ; -if (conn->ops->get_cmd_val (work) !=SMB2_CANCEL_HE ) { +if (conn->ops->get_cmd_val (work) !=SMB2_CANCEL_HE ) requests_queue = &conn->requests; - work->synchronous = true; - }if (requests_queue) {atomic_inc (&conn->req_running);
@@ -136,14 +134,14 @@ int ksmbd_conn_try_dequeue_request(struct ksmbd_work *work)if (!work->multiRsp)atomic_dec (&conn->req_running); -spin_lock (&conn->request_lock);if (!work->multiRsp) { +spin_lock (&conn->request_lock);list_del_init (&work->request_entry); -if (!work->synchronous) -list_del_init (&work->async_request_entry); +spin_unlock (&conn->request_lock); +if (work->asynchronous) +release_async_work (work); ret =0 ; } -spin_unlock (&conn->request_lock);wake_up_all (&conn->req_running_q);return ret;
fs/ksmbd/ksmbd_work.h +1 -1
@@ -68,7 +68,7 @@ struct ksmbd_work {/* Request is encrypted */ bool encrypted:1;/* Is this SYNC or ASYNC ksmbd_work */ - bool synchronous:1; + bool asynchronous:1; bool need_invalidate_rkey:1;unsigned int remote_key;
fs/ksmbd/smb2pdu.c +21 -12
@@ -498,12 +498,6 @@ int init_smb2_rsp_hdr(struct ksmbd_work *work) rsp_hdr->SessionId = rcv_hdr->SessionId;memcpy (rsp_hdr->Signature, rcv_hdr->Signature,16 ); - work->synchronous = true; -if (work->async_id) { -ksmbd_release_id (&conn->async_ida, work->async_id); - work->async_id =0 ; - } -return 0 ; }
@@ -644,7 +638,7 @@ int setup_async_work(struct ksmbd_work *work, void (*fn)(void **), void **arg)pr_err ("Failed to alloc async message id\n" );return id; } - work->synchronous = false; + work->asynchronous = true; work->async_id = id; rsp_hdr->Id.AsyncId =cpu_to_le64 (id);
@@ -664,6 +658,24 @@ int setup_async_work(struct ksmbd_work *work, void (*fn)(void **), void **arg)return 0 ; } +void release_async_work (struct ksmbd_work *work) +{ +struct ksmbd_conn *conn = work->conn; + +spin_lock (&conn->request_lock); +list_del_init (&work->async_request_entry); +spin_unlock (&conn->request_lock); + + work->asynchronous =0 ; + work->cancel_fn =NULL ; +kfree (work->cancel_argv); + work->cancel_argv =NULL ; +if (work->async_id) { +ksmbd_release_id (&conn->async_ida, work->async_id); + work->async_id =0 ; + } +} +void smb2_send_interim_resp (struct ksmbd_work *work,__le32 status) {struct smb2_hdr *rsp_hdr;
@@ -7045,13 +7057,9 @@ int smb2_lock(struct ksmbd_work *work)ksmbd_vfs_posix_lock_wait (flock); -spin_lock (&work->conn->request_lock);spin_lock (&fp->f_lock);list_del (&work->fp_entry); - work->cancel_fn =NULL ; -kfree (argv);spin_unlock (&fp->f_lock); -spin_unlock (&work->conn->request_lock);if (work->state !=KSMBD_WORK_ACTIVE ) {list_del (&smb_lock->llist);
@@ -7069,6 +7077,7 @@ int smb2_lock(struct ksmbd_work *work) work->send_no_response =1 ; goto out; } +init_smb2_rsp_hdr (work);smb2_set_err_rsp (work); rsp->hdr.Status =
@@ -7081,7 +7090,7 @@ int smb2_lock(struct ksmbd_work *work)spin_lock (&work->conn->llist_lock);list_del (&smb_lock->clist);spin_unlock (&work->conn->llist_lock); - +release_async_work (work); goto retry; }else if (!rc) {spin_lock (&work->conn->llist_lock);
fs/ksmbd/smb2pdu.h +1 -0
@@ -486,6 +486,7 @@ int find_matching_smb2_dialect(int start_index, __le16 *cli_dialects,struct file_lock *smb_flock_init (struct file *f);int setup_async_work (struct ksmbd_work *work,void (*fn)(void **),void **arg); +void release_async_work (struct ksmbd_work *work);void smb2_send_interim_resp (struct ksmbd_work *work,__le32 status);struct channel *lookup_chann_list (struct ksmbd_session *sess,struct ksmbd_conn *conn);
Signature · 1 line
2.25.1
Namjae Jeon
maintainerPATCH 2/2 ksmbd: fix slab-out-of-bounds in init_smb2_rsp_hdr
When smb1 mount fails, KASAN detect slab-out-of-bounds in init_smb2_rsp_hdr like the following one.
For smb1 negotiate(56bytes) , init_smb2_rsp_hdr() for smb2 is called. The issue occurs while handling smb1 negotiate as smb2 server operations. Add smb server operations for smb1 (get_cmd_val, init_rsp_hdr, allocate_rsp_buf, check_user_session) to handle smb1 negotiate so that smb2 server operation does not handle it.
[ 411.400423] CIFS: VFS: Use of the less secure dialect vers=1.0 is not recommended unless required for access to very old servers [ 411.400452] CIFS: Attempting to mount \\192.168.45.139\homes [ 411.479312] ksmbd: init_smb2_rsp_hdr : 492 [ 411.479323] ================================================================== [ 411.479327] BUG: KASAN: slab-out-of-bounds in init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479369] Read of size 16 at addr ffff888488ed0734 by task kworker/14:1/199
[ 411.479379] CPU: 14 PID: 199 Comm: kworker/14:1 Tainted: G OE 6.1.21 #3 [ 411.479386] Hardware name: ASUSTeK COMPUTER INC. Z10PA-D8 Series/Z10PA-D8 Series, BIOS 3801 08/23/2019 [ 411.479390] Workqueue: ksmbd-io handle_ksmbd_work [ksmbd] [ 411.479425] Call Trace: [ 411.479428] <TASK> [ 411.479432] dump_stack_lvl+0x49/0x63 [ 411.479444] print_report+0x171/0x4a8 [ 411.479452] ? kasan_complete_mode_report_info+0x3c/0x200 [ 411.479463] ? init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479497] kasan_report+0xb4/0x130 [ 411.479503] ? init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479537] kasan_check_range+0x149/0x1e0 [ 411.479543] memcpy+0x24/0x70 [ 411.479550] init_smb2_rsp_hdr+0x1e2/0x1f4 [ksmbd] [ 411.479585] handle_ksmbd_work+0x109/0x760 [ksmbd] [ 411.479616] ? _raw_spin_unlock_irqrestore+0x50/0x50 [ 411.479624] ? smb3_encrypt_resp+0x340/0x340 [ksmbd] [ 411.479656] process_one_work+0x49c/0x790 [ 411.479667] worker_thread+0x2b1/0x6e0 [ 411.479674] ? process_one_work+0x790/0x790 [ 411.479680] kthread+0x177/0x1b0 [ 411.479686] ? kthread_complete_and_exit+0x30/0x30 [ 411.479692] ret_from_fork+0x22/0x30 [ 411.479702] </TASK>
--- fs/ksmbd/server.c | 5 +- fs/ksmbd/smb2pdu.c | 3 - fs/ksmbd/smb_common.c | 138 +++++++++++++++++++++++++++++++++--------- fs/ksmbd/smb_common.h | 2 +- 4 files changed, 111 insertions(+), 37 deletions(-)
fs/ksmbd/server.c +1 -4
@@ -289,10 +289,7 @@ static int queue_ksmbd_work(struct ksmbd_conn *conn) work->request_buf = conn->request_buf; conn->request_buf =NULL ; -if (ksmbd_init_smb_server (work)) { -ksmbd_free_work_struct (work); -return -EINVAL ; - } +ksmbd_init_smb_server (work);ksmbd_conn_enqueue_request (work);atomic_inc (&conn->r_count);
fs/ksmbd/smb2pdu.c +0 -3
@@ -229,9 +229,6 @@ int init_smb2_neg_rsp(struct ksmbd_work *work)struct smb2_negotiate_rsp *rsp;struct ksmbd_conn *conn = work->conn; -if (conn->need_neg == false) -return -EINVAL ; - *(__be32 *)work->response_buf =cpu_to_be32 (conn->vals->header_size);
fs/ksmbd/smb_common.c +109 -29
173 lines not on this page · raw message
fs/ksmbd/smb_common.h +1 -1
@@ -427,7 +427,7 @@ bool ksmbd_smb_request(struct ksmbd_conn *conn);int ksmbd_lookup_dialect_by_id (__le16 *cli_dialects,__le16 dialects_count); -int ksmbd_init_smb_server (struct ksmbd_work *work); +void ksmbd_init_smb_server (struct ksmbd_work *work);struct ksmbd_kstat ; int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work,
Signature · 1 line
2.25.1