]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 15 May 2019 17:33:50 +0000 (12:33 -0500)
committerEric W. Biederman <ebiederm@xmission.com>
Mon, 27 May 2019 14:36:28 +0000 (09:36 -0500)
The locking in force_sig_info is not prepared to deal with a task that
exits or execs (as sighand may change).  The is not a locking problem
in force_sig as force_sig is only built to handle synchronous
exceptions.

Further the function force_sig_info changes the signal state if the
signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the
delivery of the signal.  The signal SIGKILL can not be ignored and can
not be blocked and SIGNAL_UNKILLABLE won't prevent it from being
delivered.

So using force_sig rather than send_sig for SIGKILL is confusing
and pointless.

Because it won't impact the sending of the signal and and because
using force_sig is wrong, replace force_sig with send_sig.

Cc: Namjae Jeon <namjae.jeon@samsung.com>
Cc: Jeff Layton <jlayton@primarydata.com>
Cc: Steve French <smfrench@gmail.com>
Fixes: a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"")
Fixes: e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
fs/cifs/connect.c

index 8c4121da624e153fd91935b3f698c84bc1e9e889..ed22bffb3fcc52d39b20ca70ac27aa5a942bf904 100644 (file)
@@ -2629,7 +2629,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect)
 
        task = xchg(&server->tsk, NULL);
        if (task)
-               force_sig(SIGKILL, task);
+               send_sig(SIGKILL, task, 1);
 }
 
 static struct TCP_Server_Info *