Unverified Commit ec5f6737 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9826 smb: client: fix potential deadlock when releasing mids 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5FL3ITFWZ4K4ALGYPPJP5CL2AMRIT7BI/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4KS 
 
Link:https://gitee.com/openeuler/kernel/pulls/9826

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 888fb169 76e8c725

fs/cifs/cifsproto.h

+6 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer, 
					struct TCP_Server_Info *server);

extern void DeleteMidQEntry(struct mid_q_entry *midEntry);

extern void cifs_delete_mid(struct mid_q_entry *mid);

extern void cifs_mid_q_entry_release(struct mid_q_entry *midEntry);

void _cifs_mid_q_entry_release(struct kref *refcount);

extern void cifs_wake_up_task(struct mid_q_entry *mid);

extern int cifs_handle_standard(struct TCP_Server_Info *server,

				struct mid_q_entry *mid);
@@ -646,4 +646,9 @@ static inline int cifs_create_options(struct cifs_sb_info *cifs_sb, int options) 
		return options;

}



static inline void cifs_mid_q_entry_release(struct mid_q_entry *midEntry)

{

	kref_put(&midEntry->refcount, _cifs_mid_q_entry_release);

}



#endif			/* _CIFSPROTO_H */

fs/cifs/smb2misc.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ __smb2_handle_cancelled_cmd(struct cifs_tcon *tcon, __u16 cmd, __u64 mid, 
{

	struct close_cancelled_open *cancelled;



	cancelled = kzalloc(sizeof(*cancelled), GFP_ATOMIC);

	cancelled = kzalloc(sizeof(*cancelled), GFP_KERNEL);

	if (!cancelled)

		return -ENOMEM;

fs/cifs/transport.c

+1 −8
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server) 
	return temp;

}



static void _cifs_mid_q_entry_release(struct kref *refcount)

void _cifs_mid_q_entry_release(struct kref *refcount)

{

	struct mid_q_entry *midEntry =

			container_of(refcount, struct mid_q_entry, refcount);
@@ -168,13 +168,6 @@ static void _cifs_mid_q_entry_release(struct kref *refcount) 
	mempool_free(midEntry, cifs_mid_poolp);

}



void cifs_mid_q_entry_release(struct mid_q_entry *midEntry)

{

	spin_lock(&GlobalMid_Lock);

	kref_put(&midEntry->refcount, _cifs_mid_q_entry_release);

	spin_unlock(&GlobalMid_Lock);

}



void DeleteMidQEntry(struct mid_q_entry *midEntry)

{

	cifs_mid_q_entry_release(midEntry);