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,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 56FA1C606C1 for ; Mon, 8 Jul 2019 15:19:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2602B216F4 for ; Mon, 8 Jul 2019 15:19:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599157; bh=bfHs3ROo57RB2tcNBss4vHTBOJ2MIl4Akl8RACSTyxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r5xLcFtNPN5eunVBSHg0l6BZ7wo+vV1WRcJWX13TOMek9f7GQrGLb1JXubBMOPrkq 5dY94rbrx8FiCVqSQ/e5iReZIUTr3pdb+62Xf4ijbcjq7cv9NoNjBiSXWtKKDv6q3A hHNU6ydy8l6ZS6ge9Cf6MvjLpurWnWF5y8qzPvRs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733206AbfGHPTQ (ORCPT ); Mon, 8 Jul 2019 11:19:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:43424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733192AbfGHPTN (ORCPT ); Mon, 8 Jul 2019 11:19:13 -0400 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 032512166E; Mon, 8 Jul 2019 15:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599152; bh=bfHs3ROo57RB2tcNBss4vHTBOJ2MIl4Akl8RACSTyxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vPDNrVxI9Eu/dagqpoq9nhyZoRC6hXV81J5K07SpnDkgX0ftP9As7AV2DiCYSFTS8 vB/Pbnyu5ifEz1GfN6HC7jjje6ttnbZeO5Swo1+IR+FruStWCGG2CuxUXhGfPNH5Un +dq6vqGk71lWRiwaCGnUHK4VOhb5VZnRcV7e2JWY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Avri Altman , Alim Akhtar , Bean Huo , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.9 022/102] scsi: ufs: Check that space was properly alloced in copy_query_response Date: Mon, 8 Jul 2019 17:12:15 +0200 Message-Id: <20190708150527.366495203@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150525.973820964@linuxfoundation.org> References: <20190708150525.973820964@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 [ 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 0fe4f8e8c8c9..a9c172692f21 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -941,7 +941,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