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.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,URIBL_BLOCKED,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 1399BC31E4B for ; Fri, 14 Jun 2019 20:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D060621841 for ; Fri, 14 Jun 2019 20:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544276; bh=ZujzLGtZIzPwo5XQIVhDX0Yl5TftEs5UwsxtROafMGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q/i5O4v9hQsEen9lVKp7H6sfMfx2RfA7yoXLLkHzekQRJkKSk5gJmRqMYE+zs9p5s yOVT4JIhdO6Y6ff/25Xm+FTlErGCiKKn5xfZD2X8Xp2EEWr1SUNM5TKTh/o80Gz98O QEHiFZT6vJzl4sFQ8lzOYnmd6Z6dgYXd44WkNQX4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728061AbfFNUa7 (ORCPT ); Fri, 14 Jun 2019 16:30:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:54802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726917AbfFNUa6 (ORCPT ); Fri, 14 Jun 2019 16:30:58 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (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 6BC0921841; Fri, 14 Jun 2019 20:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544257; bh=ZujzLGtZIzPwo5XQIVhDX0Yl5TftEs5UwsxtROafMGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MrwgkAjKC1IU2HGwdX73OvMLKoEaqI+yg2Qm+5yO9ahkUeNRh+bYGBzi3nmPflJvK iQ98QTMa8zovyTPEWTaC98lXL6LblWNPI7nKSB7bHPx4tZ86w6MNiVEL14UTLPWCzV A1WmcNgXhMbdHpicjz6uDV91Ebf3yy7iUqio+1lM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Avri Altman , Alim Akhtar , Bean Huo , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 08/10] scsi: ufs: Check that space was properly alloced in copy_query_response Date: Fri, 14 Jun 2019 16:30:44 -0400 Message-Id: <20190614203046.28077-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614203046.28077-1-sashal@kernel.org> References: <20190614203046.28077-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Avri Altman [ Upstream commit 1c90836f70f9a8ef7b7ad9e1fdd8961903e6ced6 ] struct ufs_dev_cmd is the main container that supports device management commands. In the case of a read descriptor request, we assume that the proper space was allocated in dev_cmd to hold the returning descriptor. This is no longer true, as there are flows that doesn't use dev_cmd for device management requests, and was wrong in the first place. Fixes: d44a5f98bb49 (ufs: query descriptor API) Signed-off-by: Avri Altman Reviewed-by: Alim Akhtar Acked-by: Bean Huo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 7322a17660d1..b140e81c4f7d 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -853,7 +853,8 @@ int ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) memcpy(&query_res->upiu_res, &lrbp->ucd_rsp_ptr->qr, QUERY_OSF_SIZE); /* Get the descriptor */ - if (lrbp->ucd_rsp_ptr->qr.opcode == UPIU_QUERY_OPCODE_READ_DESC) { + if (hba->dev_cmd.query.descriptor && + lrbp->ucd_rsp_ptr->qr.opcode == UPIU_QUERY_OPCODE_READ_DESC) { u8 *descp = (u8 *)lrbp->ucd_rsp_ptr + GENERAL_UPIU_REQUEST_SIZE; u16 resp_len; -- 2.20.1