Skip to content

Commit abe5707

Browse files
piastrySteve French
authored andcommitted
CIFS: Fix retry mid list corruption on reconnects
When the client hits reconnect it iterates over the mid pending queue marking entries for retry and moving them to a temporary list to issue callbacks later without holding GlobalMid_Lock. In the same time there is no guarantee that mids can't be removed from the temporary list or even freed completely by another thread. It may cause a temporary list corruption: [ 430.454897] list_del corruption. prev->next should be ffff98d3a8f316c0, but was 2e885cb266355469 [ 430.464668] ------------[ cut here ]------------ [ 430.466569] kernel BUG at lib/list_debug.c:51! [ 430.468476] invalid opcode: 0000 [#1] SMP PTI [ 430.470286] CPU: 0 PID: 13267 Comm: cifsd Kdump: loaded Not tainted 5.4.0-rc3+ #19 [ 430.473472] Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 [ 430.475872] RIP: 0010:__list_del_entry_valid.cold+0x31/0x55 ... [ 430.510426] Call Trace: [ 430.511500] cifs_reconnect+0x25e/0x610 [cifs] [ 430.513350] cifs_readv_from_socket+0x220/0x250 [cifs] [ 430.515464] cifs_read_from_socket+0x4a/0x70 [cifs] [ 430.517452] ? try_to_wake_up+0x212/0x650 [ 430.519122] ? cifs_small_buf_get+0x16/0x30 [cifs] [ 430.521086] ? allocate_buffers+0x66/0x120 [cifs] [ 430.523019] cifs_demultiplex_thread+0xdc/0xc30 [cifs] [ 430.525116] kthread+0xfb/0x130 [ 430.526421] ? cifs_handle_standard+0x190/0x190 [cifs] [ 430.528514] ? kthread_park+0x90/0x90 [ 430.530019] ret_from_fork+0x35/0x40 Fix this by obtaining extra references for mids being retried and marking them as MID_DELETED which indicates that such a mid has been dequeued from the pending list. Also move mid cleanup logic from DeleteMidQEntry to _cifs_mid_q_entry_release which is called when the last reference to a particular mid is put. This allows to avoid any use-after-free of response buffers. The patch needs to be backported to stable kernels. A stable tag is not mentioned below because the patch doesn't apply cleanly to any actively maintained stable kernel. Reviewed-by: Ronnie Sahlberg <[email protected]> Reviewed-and-tested-by: David Wysochanski <[email protected]> Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 783bf7b commit abe5707

File tree

2 files changed

+32
-20
lines changed

2 files changed

+32
-20
lines changed

fs/cifs/connect.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,11 @@ cifs_reconnect(struct TCP_Server_Info *server)
564564
spin_lock(&GlobalMid_Lock);
565565
list_for_each_safe(tmp, tmp2, &server->pending_mid_q) {
566566
mid_entry = list_entry(tmp, struct mid_q_entry, qhead);
567+
kref_get(&mid_entry->refcount);
567568
if (mid_entry->mid_state == MID_REQUEST_SUBMITTED)
568569
mid_entry->mid_state = MID_RETRY_NEEDED;
569570
list_move(&mid_entry->qhead, &retry_list);
571+
mid_entry->mid_flags |= MID_DELETED;
570572
}
571573
spin_unlock(&GlobalMid_Lock);
572574
mutex_unlock(&server->srv_mutex);
@@ -576,6 +578,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
576578
mid_entry = list_entry(tmp, struct mid_q_entry, qhead);
577579
list_del_init(&mid_entry->qhead);
578580
mid_entry->callback(mid_entry);
581+
cifs_mid_q_entry_release(mid_entry);
579582
}
580583

581584
if (cifs_rdma_enabled(server)) {
@@ -895,8 +898,10 @@ dequeue_mid(struct mid_q_entry *mid, bool malformed)
895898
if (mid->mid_flags & MID_DELETED)
896899
printk_once(KERN_WARNING
897900
"trying to dequeue a deleted mid\n");
898-
else
901+
else {
899902
list_del_init(&mid->qhead);
903+
mid->mid_flags |= MID_DELETED;
904+
}
900905
spin_unlock(&GlobalMid_Lock);
901906
}
902907

@@ -966,8 +971,10 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
966971
list_for_each_safe(tmp, tmp2, &server->pending_mid_q) {
967972
mid_entry = list_entry(tmp, struct mid_q_entry, qhead);
968973
cifs_dbg(FYI, "Clearing mid 0x%llx\n", mid_entry->mid);
974+
kref_get(&mid_entry->refcount);
969975
mid_entry->mid_state = MID_SHUTDOWN;
970976
list_move(&mid_entry->qhead, &dispose_list);
977+
mid_entry->mid_flags |= MID_DELETED;
971978
}
972979
spin_unlock(&GlobalMid_Lock);
973980

@@ -977,6 +984,7 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
977984
cifs_dbg(FYI, "Callback mid 0x%llx\n", mid_entry->mid);
978985
list_del_init(&mid_entry->qhead);
979986
mid_entry->callback(mid_entry);
987+
cifs_mid_q_entry_release(mid_entry);
980988
}
981989
/* 1/8th of sec is more than enough time for them to exit */
982990
msleep(125);

fs/cifs/transport.c

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,8 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
8686

8787
static void _cifs_mid_q_entry_release(struct kref *refcount)
8888
{
89-
struct mid_q_entry *mid = container_of(refcount, struct mid_q_entry,
90-
refcount);
91-
92-
mempool_free(mid, cifs_mid_poolp);
93-
}
94-
95-
void cifs_mid_q_entry_release(struct mid_q_entry *midEntry)
96-
{
97-
spin_lock(&GlobalMid_Lock);
98-
kref_put(&midEntry->refcount, _cifs_mid_q_entry_release);
99-
spin_unlock(&GlobalMid_Lock);
100-
}
101-
102-
void
103-
DeleteMidQEntry(struct mid_q_entry *midEntry)
104-
{
89+
struct mid_q_entry *midEntry =
90+
container_of(refcount, struct mid_q_entry, refcount);
10591
#ifdef CONFIG_CIFS_STATS2
10692
__le16 command = midEntry->server->vals->lock_cmd;
10793
__u16 smb_cmd = le16_to_cpu(midEntry->command);
@@ -166,15 +152,30 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
166152
}
167153
}
168154
#endif
155+
156+
mempool_free(midEntry, cifs_mid_poolp);
157+
}
158+
159+
void cifs_mid_q_entry_release(struct mid_q_entry *midEntry)
160+
{
161+
spin_lock(&GlobalMid_Lock);
162+
kref_put(&midEntry->refcount, _cifs_mid_q_entry_release);
163+
spin_unlock(&GlobalMid_Lock);
164+
}
165+
166+
void DeleteMidQEntry(struct mid_q_entry *midEntry)
167+
{
169168
cifs_mid_q_entry_release(midEntry);
170169
}
171170

172171
void
173172
cifs_delete_mid(struct mid_q_entry *mid)
174173
{
175174
spin_lock(&GlobalMid_Lock);
176-
list_del_init(&mid->qhead);
177-
mid->mid_flags |= MID_DELETED;
175+
if (!(mid->mid_flags & MID_DELETED)) {
176+
list_del_init(&mid->qhead);
177+
mid->mid_flags |= MID_DELETED;
178+
}
178179
spin_unlock(&GlobalMid_Lock);
179180

180181
DeleteMidQEntry(mid);
@@ -872,7 +873,10 @@ cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server)
872873
rc = -EHOSTDOWN;
873874
break;
874875
default:
875-
list_del_init(&mid->qhead);
876+
if (!(mid->mid_flags & MID_DELETED)) {
877+
list_del_init(&mid->qhead);
878+
mid->mid_flags |= MID_DELETED;
879+
}
876880
cifs_server_dbg(VFS, "%s: invalid mid state mid=%llu state=%d\n",
877881
__func__, mid->mid, mid->mid_state);
878882
rc = -EIO;

0 commit comments

Comments
 (0)