From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2B072C33CAF for ; Thu, 16 Jan 2020 18:07:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9DEA214AF for ; Thu, 16 Jan 2020 18:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579198047; bh=krTTpBGmxTcFV7DMMTstVif5MPee/1qDrzXnztVGfTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TS/5hRqenoziwJQvu+xgIvR9j1vpjd2qiB5Ludm9L9sKgGz8kVMiNCin3wdieLXvk k56xWT/RI8T9moF9IgEv6G2AIzpjYMgzozoGv824wJzqwmigxjzpEpuf8Kv/qIM/3M AUdY2P4qJvClUMPn5g8AVGbvQKkRV/WTi6Z91ewA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405052AbgAPRkB (ORCPT ); Thu, 16 Jan 2020 12:40:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:56832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405002AbgAPRkB (ORCPT ); Thu, 16 Jan 2020 12:40:01 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ACA9924710; Thu, 16 Jan 2020 17:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196400; bh=krTTpBGmxTcFV7DMMTstVif5MPee/1qDrzXnztVGfTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/IVPhVZyzMWtVp6xCdtfi894k42tn366xdlDowrNB4YmwiH3XRHkm/O+iEXmYzim CpAcPf5RH0L5CvWXSp/ph0RVDs/q2hfCZcs7q+ebmLozP8WNFa+7OmbVhSneKC2VGU MLmlPpHA8BECCvDC9lB0drq62tt7DNrYecHTg6No= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Steve French , Ronnie Sahlberg , "Eric W . Biederman" , Sasha Levin , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH AUTOSEL 4.9 177/251] cifs: fix rmmod regression in cifs.ko caused by force_sig changes Date: Thu, 16 Jan 2020 12:35:26 -0500 Message-Id: <20200116173641.22137-137-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Steve French [ 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 --- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 110febd69737..7d46025d5e89 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -885,6 +885,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; -- 2.20.1