]> git.baikalelectronics.ru Git - kernel.git/commit
CIFS: Fix a possible double locking of mutex during reconnect
authorPavel Shilovsky <pshilov@microsoft.com>
Tue, 29 Nov 2016 19:31:23 +0000 (11:31 -0800)
committerPavel Shilovsky <pshilov@microsoft.com>
Mon, 5 Dec 2016 20:52:01 +0000 (12:52 -0800)
commit3b13db24d984f086a2c01254f6d2bb5bfff27830
treeaeb1443b368e35a1af1bf5a51a55997eb5124371
parent478481bd5726de2c9b15ee3658d38392247cf656
CIFS: Fix a possible double locking of mutex during reconnect

With the current code it is possible to lock a mutex twice when
a subsequent reconnects are triggered. On the 1st reconnect we
reconnect sessions and tcons and then persistent file handles.
If the 2nd reconnect happens during the reconnecting of persistent
file handles then the following sequence of calls is observed:

cifs_reopen_file -> SMB2_open -> small_smb2_init -> smb2_reconnect
-> cifs_reopen_persistent_file_handles -> cifs_reopen_file (again!).

So, we are trying to acquire the same cfile->fh_mutex twice which
is wrong. Fix this by moving reconnecting of persistent handles to
the delayed work (smb2_reconnect_server) and submitting this work
every time we reconnect tcon in SMB2 commands handling codepath.

This can also lead to corruption of a temporary file list in
cifs_reopen_persistent_file_handles() because we can recursively
call this function twice.

Cc: Stable <stable@vger.kernel.org> # v4.9+
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
fs/cifs/cifsglob.h
fs/cifs/file.c
fs/cifs/smb2pdu.c
fs/cifs/smb2pdu.h