diff options
| author | Pavel Shilovsky <pshilov@microsoft.com> | 2016-11-04 11:50:31 -0700 |
|---|---|---|
| committer | Pavel Shilovsky <pshilov@microsoft.com> | 2016-12-05 12:08:33 -0800 |
| commit | 53e0e11efe9289535b060a51d4cf37c25e0d0f2b (patch) | |
| tree | 46d7d80876843d554ffc9ca45ef74a2ba0233dc7 /fs/cifs/cifsglob.h | |
| parent | e3d240e9d505fc67f8f8735836df97a794bbd946 (diff) | |
| download | linux-53e0e11efe9289535b060a51d4cf37c25e0d0f2b.tar.bz2 | |
CIFS: Fix a possible memory corruption during reconnect
We can not unlock/lock cifs_tcp_ses_lock while walking through ses
and tcon lists because it can corrupt list iterator pointers and
a tcon structure can be released if we don't hold an extra reference.
Fix it by moving a reconnect process to a separate delayed work
and acquiring a reference to every tcon that needs to be reconnected.
Also do not send an echo request on newly established connections.
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 3e95191fcb95..89a0d7f17cc7 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -647,6 +647,8 @@ struct TCP_Server_Info { unsigned int max_read; unsigned int max_write; __u8 preauth_hash[512]; + struct delayed_work reconnect; /* reconnect workqueue job */ + struct mutex reconnect_mutex; /* prevent simultaneous reconnects */ #endif /* CONFIG_CIFS_SMB2 */ unsigned long echo_interval; }; @@ -850,6 +852,7 @@ cap_unix(struct cifs_ses *ses) struct cifs_tcon { struct list_head tcon_list; int tc_count; + struct list_head rlist; /* reconnect list */ struct list_head openFileList; spinlock_t open_file_lock; /* protects list above */ struct cifs_ses *ses; /* pointer to session associated with */ |