summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <stfrench@microsoft.com>2019-07-23 22:14:29 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-27 14:51:03 +0100
commit7f6a96dd8223796ffae4dd251be3bff161a28a4b (patch)
treebf0e07213ff18db2660f653d6d2264848f8be7d7 /fs
parent153797c47a5722373d07101f31f3f55f04e79c83 (diff)
downloadlinux-stable-7f6a96dd8223796ffae4dd251be3bff161a28a4b.tar.gz
linux-stable-7f6a96dd8223796ffae4dd251be3bff161a28a4b.tar.bz2
linux-stable-7f6a96dd8223796ffae4dd251be3bff161a28a4b.zip
cifs: fix rmmod regression in cifs.ko caused by force_sig changes
[ Upstream commit 247bc9470b1eeefc7b58cdf2c39f2866ba651509 ] Fixes: 72abe3bcf091 ("signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig") The global change from force_sig caused module unloading of cifs.ko to fail (since the cifsd process could not be killed, "rmmod cifs" now would always fail) Signed-off-by: Steve French <stfrench@microsoft.com> Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> CC: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a59dcda07534..a8790bf04e95 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -970,6 +970,7 @@ cifs_demultiplex_thread(void *p)
mempool_resize(cifs_req_poolp, length + cifs_min_rcv);
set_freezable();
+ allow_signal(SIGKILL);
while (server->tcpStatus != CifsExiting) {
if (try_to_freeze())
continue;