Received: by 2002:a17:90a:9103:0:0:0:0 with SMTP id k3csp11811486pjo; Thu, 2 Jan 2020 14:41:48 -0800 (PST) X-Google-Smtp-Source: APXvYqxJDr7GI47N/Mdcu3T2R8LNhmYbDZGzPbJ1mxIBDejpq/RJ4b0mfqXcyKewJB91Szdos+Dv X-Received: by 2002:a05:6830:4c2:: with SMTP id s2mr98191599otd.144.1578004908682; Thu, 02 Jan 2020 14:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578004908; cv=none; d=google.com; s=arc-20160816; b=bUvxyhjGxJVvuPDYp8+oSWDyl4+x7xTWQJmGfoUnXdcew9WFmsAIcjUkxsmyOIUBZy dVlsq2/PPEwezOvoehhaMhO/eBItkOhreDoVsKZRzl8uujNpNWpq5NT1P0tR6CilrEjv g/0U59KawETl8TMnIBQyqSt7W+z0FefYD8PIO9a6GGE7z0WwdJtr3a4jIbexjLNf/Jh6 9iNVGTp3QnteDAIH/BQdMflee35rnrbOl4GlD7ABiPR6Yu9L9nCBmExPy1RFg7ww+c8X YJz6vbHeZPzcN4+SvnpFuowDDqaQ57zicf+RM8vQFrotTxeO8/7n+xrPCJ+pOxkfe88R 28Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BaxY6hhFg9cJDDZfDy6j19spLPTbl42aB6y9WZiMXgg=; b=D9ep5DyMjy2Aq+0os6beEga7P7TTh6yYOcwew9HqjBsiOaq3tr28+19PsUTJnw+yCg DUuCtj4nyG7gTiFu5YHr28EwdNA9KkrfLVqtJnMPbQ/wS+rGTX+rNhyKkdzxgJZlmKMX oHxd6sbYVDZWqBdyS+z2nEjv8B3ucHdjuw0LZge24TUfuVcSN48p2sOwliOPZCphrqjv nC0RKc3jQglsHsPXxmPl3rKZ+ygNffUdjNE0vc9ZtmQy6pIMQ8KEwdo7HtPCUno1NxNm bEiszXuG/dRFoNnFbCVPdE6armD90/nBrwLad7tQJUiaFuzr1p5PiPEhn+qoKw/2Tsmg CUdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=x5sbzKdT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s20si25814647otq.28.2020.01.02.14.41.36; Thu, 02 Jan 2020 14:41:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=x5sbzKdT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731490AbgABWjd (ORCPT + 99 others); Thu, 2 Jan 2020 17:39:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:55942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730922AbgABWja (ORCPT ); Thu, 2 Jan 2020 17:39:30 -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 6258F20866; Thu, 2 Jan 2020 22:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004769; bh=ekqCwYEYGEF20WFESDIo3WgiPNVLmqvdubZPncIpGAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x5sbzKdTzGa+EX+X381SCxnrFVwSFXEOaSVLlhdfHv7UZ7YOZAVVgEHtFTp5WNS9c c4M73zrNVuhxLDOU3Ysbtqsp6QtRoKmlGS5lb+0dA7VJTGgWdRMzgyPzMLoka/Pt0j gCKdjt7GtHw9z5wbE7NoJPJ9wDsWgE4uLPJzyF70= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alim Akhtar , Bart Van Assche , Bean Huo , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.4 110/137] scsi: ufs: fix potential bug which ends in system hang Date: Thu, 2 Jan 2020 23:08:03 +0100 Message-Id: <20200102220601.952122769@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.618583146@linuxfoundation.org> References: <20200102220546.618583146@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: Bean Huo [ Upstream commit cfcbae3895b86c390ede57b2a8f601dd5972b47b ] In function __ufshcd_query_descriptor(), in the event of an error happening, we directly goto out_unlock and forget to invaliate hba->dev_cmd.query.descriptor pointer. This results in this pointer still valid in ufshcd_copy_query_response() for other query requests which go through ufshcd_exec_raw_upiu_cmd(). This will cause __memcpy() crash and system hangs. Log as shown below: Unable to handle kernel paging request at virtual address ffff000012233c40 Mem abort info: ESR = 0x96000047 Exception class = DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000047 CM = 0, WnR = 1 swapper pgtable: 4k pages, 48-bit VAs, pgdp = 0000000028cc735c [ffff000012233c40] pgd=00000000bffff003, pud=00000000bfffe003, pmd=00000000ba8b8003, pte=0000000000000000 Internal error: Oops: 96000047 [#2] PREEMPT SMP ... Call trace: __memcpy+0x74/0x180 ufshcd_issue_devman_upiu_cmd+0x250/0x3c0 ufshcd_exec_raw_upiu_cmd+0xfc/0x1a8 ufs_bsg_request+0x178/0x3b0 bsg_queue_rq+0xc0/0x118 blk_mq_dispatch_rq_list+0xb0/0x538 blk_mq_sched_dispatch_requests+0x18c/0x1d8 __blk_mq_run_hw_queue+0xb4/0x118 blk_mq_run_work_fn+0x28/0x38 process_one_work+0x1ec/0x470 worker_thread+0x48/0x458 kthread+0x130/0x138 ret_from_fork+0x10/0x1c Code: 540000ab a8c12027 a88120c7 a8c12027 (a88120c7) ---[ end trace 793e1eb5dff69f2d ]--- note: kworker/0:2H[2054] exited with preempt_count 1 This patch is to move "descriptor = NULL" down to below the label "out_unlock". Fixes: d44a5f98bb49b2(ufs: query descriptor API) Link: https://lore.kernel.org/r/20191112223436.27449-3-huobean@gmail.com Reviewed-by: Alim Akhtar Reviewed-by: Bart Van Assche Signed-off-by: Bean Huo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 504d36796152..fcf5141bf950 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1809,10 +1809,10 @@ static int ufshcd_query_descriptor(struct ufs_hba *hba, goto out_unlock; } - hba->dev_cmd.query.descriptor = NULL; *buf_len = be16_to_cpu(response->upiu_res.length); out_unlock: + hba->dev_cmd.query.descriptor = NULL; mutex_unlock(&hba->dev_cmd.lock); out: ufshcd_release(hba); -- 2.20.1