Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp17928296ybl; Thu, 2 Jan 2020 15:00:43 -0800 (PST) X-Google-Smtp-Source: APXvYqxhNLNKgat4QcBTwBVigi4Dnja8HX0/pw86ePU/z8Ml0bpjdNGIAqVgy8N8fBI7VIoYYgzh X-Received: by 2002:a9d:480b:: with SMTP id c11mr84094825otf.283.1578006043245; Thu, 02 Jan 2020 15:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578006043; cv=none; d=google.com; s=arc-20160816; b=WftRtISKFtfiu7wj3bXMtmaBQPqHPEZh/srln1P02Nxebx268nD7NJp30bGO24vmkO KSiYgF6pxg9H5VBOUxoRioxqkKwed9ESNSgpaAKXFDCgI885UlvJRYSuHKwMDo2dWwr3 KhhDGl4cFmPUnKWEr5knVzHN0thtHdTtmXpWhiUqqNOL9raUV+L7zYxZAVn2mvfxJuLw gK+pU2EwzdUhD4xtORQ78CsLfw/rUDcSWzCkOU8ValOqO32S1Q9RWEDBIvSRs1Bczyry OgetPiOtXH4v+ufLyH8OnzxVLbpuWSpXPAvHbi6eqmtxOGxlyKj+rWOt+NA+LaSkPihW haMQ== 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=8bb9rfMaHXHb5AWZThCaq++OUMeBh0EtlmE9Qg7YHik=; b=B75Jr/PQ3ZAj8UpodB7vDDZiVMrpaB6kDsn/cW2+JpUafjPV2scZDaVEG5Y0sR2bVM AlAxBy1BsTnyW8JviGAyq8GVyc5tdxT6Pmm+stlUaaPv2tevwelawXTr9bVSagKIA3Dl T4XnI8n+Fv8Hlr3oL/rTMVlVFi1EiN5aKa4qz4+gFkcvMI4hHHkzfXwnGH8Ix1Rmcipy HBSoJEiqV5g8REHlEaujj1BKAY3EVfMX3pFYeXFEO0i8eXjI9cMaRQsD45boIICZXby3 Abhdxq0O+tT7syCvYxhY5Yuquz/3OFUxkDVRfy4eE6Hzqhq8HWjTIJaSC6Iykqa73rzC yezg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sOo1aYIk; 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 p21si20400835otk.162.2020.01.02.15.00.31; Thu, 02 Jan 2020 15:00:43 -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=sOo1aYIk; 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 S1728279AbgABW7S (ORCPT + 99 others); Thu, 2 Jan 2020 17:59:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:54762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727557AbgABWO3 (ORCPT ); Thu, 2 Jan 2020 17:14:29 -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 BF70C227BF; Thu, 2 Jan 2020 22:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003268; bh=eofsLENhT2RlPaALZDa2KWrt/kUmXpwMYTgW9ahZ3Cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sOo1aYIk77NHVgA6FMQulyklYmrRxZx8z5mzXJwDDOumOP9iJEknCTCyYeMIQx/1O s8ypDrIBhtljvUCU2aqHLelQh4Z1IDRxwjOC870H4EPBs2rhrBloQLDZpLD2vBRlxM 2a1J2CSpiA+wUTqy3woJYCGvWTn1/idMH633tfPE= 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 5.4 064/191] scsi: ufs: fix potential bug which ends in system hang Date: Thu, 2 Jan 2020 23:05:46 +0100 Message-Id: <20200102215836.830540266@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102215829.911231638@linuxfoundation.org> References: <20200102215829.911231638@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 11a87f51c442..358ff7b01568 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2986,10 +2986,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