From patchwork Fri Jan 24 09:30:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EB96C35242 for ; Fri, 24 Jan 2020 09:58:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBE9A21556 for ; Fri, 24 Jan 2020 09:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859938; bh=JE2KwmqlMMJMw8S3laBqZk68CliPBc2y48a8KjjzSYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RF8XtTQ+bjw5PZx4wB0UzJwastlGZt/43S2HcslpYvrSnfibZGm2te+CPYN1T/xEL YNtj7E5U2+uCizfMklX7ugeQkm4basfGvOyDvEsg4ZGezPuWAnAnSSHNWU9QxlhXY6 hRL5m8tVv0vrAh2UiOvSeI7MC/YM7BSv9/MtdQ/k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731740AbgAXJ66 (ORCPT ); Fri, 24 Jan 2020 04:58:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:34512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbgAXJ66 (ORCPT ); Fri, 24 Jan 2020 04:58:58 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2701214AF; Fri, 24 Jan 2020 09:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859937; bh=JE2KwmqlMMJMw8S3laBqZk68CliPBc2y48a8KjjzSYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FEwgZ8faziWRLFBLPV3+IM4GPoRj1G9lSasQRL+Llt4VxoTGYTkl+BQttQ52pSml0 J2wgq5fmhrVbA11RCM2HcA74Lj8nJGtdczwMss4IC8qTpd3iDKxGNXBvTT6sZCnQbE b1PXkogUI0dEQhA5K+hZgOVOboIaF0cazirsxOto= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Namjae Jeon , Jeff Layton , Steve French , "Eric W. Biederman" , Sasha Levin Subject: [PATCH 4.14 225/343] signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig Date: Fri, 24 Jan 2020 10:30:43 +0100 Message-Id: <20200124092949.774512987@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric W. Biederman [ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ] 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 Cc: Jeff Layton Cc: Steve French 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" Signed-off-by: Sasha Levin --- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index f523a9ca9574f..51bbb1c0b71ae 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2320,7 +2320,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 *