From 69bed7d43dcb845a21cdd20a8667f4918e896849 Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 15 Apr 2021 17:30:04 +0800 Subject: [PATCH] cifs: fix rmmod regression in cifs.ko caused by force_sig changes stable inclusion from linux-4.19.99 commit 7f6a96dd8223796ffae4dd251be3bff161a28a4b bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=27 CVE: NA --------------------------- [ 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 Reviewed-by: Ronnie Sahlberg CC: Eric W. Biederman Signed-off-by: Sasha Levin Signed-off-by: Yang Yingliang [io_uring need allow_kernel_signal] Signed-off-by: yangerkun Reviewed-by: zhangyi (F) Signed-off-by: Cheng Jian --- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d4b8f0ecf50a..ef7e71b904df 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -974,6 +974,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; -- GitLab