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=-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 C6425C2D0DB for ; Tue, 28 Jan 2020 14:22:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9945824698 for ; Tue, 28 Jan 2020 14:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221326; bh=lcRUZWbJu9u59DXMqemJIcKCLLEgYSEVTasMfOb9pAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HtPVkC0vJvjxIssewQby4kmC5ty00qTmPCkP19utK8Zw0LQ5kxD4lysM+w9kk4pfV JUFKwxT/J9Arojd93O4lk1eOk7K5lng8eLz/g8wKYTyOtQ+VHHm6JnEs9ki6xiotS8 HuNY07uPhGZFXrMPp4fDAtrMCP9TihB/jQOhsOAI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731492AbgA1OWF (ORCPT ); Tue, 28 Jan 2020 09:22:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:47700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730979AbgA1OWE (ORCPT ); Tue, 28 Jan 2020 09:22:04 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 F12952468F; Tue, 28 Jan 2020 14:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221323; bh=lcRUZWbJu9u59DXMqemJIcKCLLEgYSEVTasMfOb9pAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CBDuIS/LK22LX6fo5toBjYIsl6TovjO/fe77zHdBETjbmnMshCIDxR8cWS/HeOZHl KXBmEPPlv+47pI9NoyXj0EEikagPX+kY+5VEEqGwNIRE9dp1oVnGQ/VMdjPvNZZ1xO nXQ/3Uoc6sFpKBVVcEOXR71v17bavGwoOuIn9YrY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve French , Ronnie Sahlberg , "Eric W. Biederman" , Sasha Levin Subject: [PATCH 4.9 177/271] cifs: fix rmmod regression in cifs.ko caused by force_sig changes Date: Tue, 28 Jan 2020 15:05:26 +0100 Message-Id: <20200128135905.723702963@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 110febd697379..7d46025d5e899 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