Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp459914pxb; Thu, 9 Sep 2021 05:05:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnhOqH02bx0w+/Ir2z1ZsPQbqi494llg0+70Bg+UHpxBzx6ZYr52+goBsS6cuB5gYjyJ4d X-Received: by 2002:a17:906:3159:: with SMTP id e25mr2954137eje.549.1631189153428; Thu, 09 Sep 2021 05:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631189153; cv=none; d=google.com; s=arc-20160816; b=yIYapq0JQc8RffuGIak5wgm1JIq2xPwHcFPYak6xIVzOcAf/QlpJFNpe9CbDtWMQzk Tgnb75H5hTVrFdX9stfuyZMwgsCds4OzABAsI3T0ZM5GNruxW2bbUzg+0qeUGK7nGXM+ /RZ+vCsroq6IoVJa9lRtVcN6LyjMYn21LZrrJfH29XIXaLmiZfOIUsFT3UMVAm4IjVIS HhJ0JWQBzabkidu9UTWw40eE3ETz/r+a2C/XrF4OeRx8vD/EMqYMkBjCODvH44IKCxO+ rvavJqICY0TOF/FtKWV/2nb1thDirnHy+I1x2RJZjxILgXg0e0K0QpXvyZuWT8+11zsM 9pHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NEuYNzm2xoQHxFkuG4M2uS4wVLCAFLbhT+WRqlRbkXI=; b=HZCVyY6oM522gUvFS7Bg9R0R5oYac+GPlqnQbhrhTpvD5w7UZaEUnEAsWW56/h0oPB yafeP9elXaHlQ3qkyI/gnoQgwlJrj55k5X1F0+SacQO74QxbMuIOBj4Jp+beuJQrS82z 8SIMvj1rtEfUDRl5SnTF0a9flfDdm50IUc17yerGT2XBgisBlqj7QjtMKUKOFPknW7Eh 0OenQAno5eyTNhsokNYmYQdIqiRKjEWxcT5S83ZpbwlB3pQEc6OczW28gRf8lXFeto7E Yly3V5D4CO57ec9z774RWo1zVdcz47ZWll9vQch5eixfpnofEdPlArcLmym+qGS4GB29 TGqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NkIQo9qv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 12si1834637ejk.308.2021.09.09.05.05.13; Thu, 09 Sep 2021 05:05:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NkIQo9qv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345307AbhIIMCe (ORCPT + 99 others); Thu, 9 Sep 2021 08:02:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:34380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235604AbhIIL6c (ORCPT ); Thu, 9 Sep 2021 07:58:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 93745611C4; Thu, 9 Sep 2021 11:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187941; bh=2KRvm6aTvUu4pu1QHXu6z4YnVYGYLqDrbklMn0PN8Vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NkIQo9qvxiQEImbnsAGSP4FInYJmkwgMi19rTrr37Pfqqb/uNd3JSn1jpDQ9tSMfu FQlr6tXENX8h2Xo9EDe836FQz3GfdTqlSKbxVM/JCrXlDbCIc2+RdbkzxH0kQRBF3p v4SXNOAXYT/6VEqd02Fj7RU/UCZ2+MNlnEYaV1vwOT+4JTbhEsgUXV750HS/ShV96o lUMmNYz7VkBVvM+t6C8pNflPQhHIw7vvDLdGZJodDYkmf1b1jZKDZ//hIGWnXhxktC sv+6vBN+P23iOZTBKGYmOaurMiKE38imfa71VoBblgw7P1Y//pm+akyBTtL4RPQPlI fo5fEVXU17yiA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nishad Kamdar , Avri Altman , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 211/252] mmc: core: Return correct emmc response in case of ioctl error Date: Thu, 9 Sep 2021 07:40:25 -0400 Message-Id: <20210909114106.141462-211-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nishad Kamdar [ Upstream commit e72a55f2e5ddcfb3dce0701caf925ce435b87682 ] When a read/write command is sent via ioctl to the kernel, and the command fails, the actual error response of the emmc is not sent to the user. IOCTL read/write tests are carried out using commands 17 (Single BLock Read), 24 (Single Block Write), 18 (Multi Block Read), 25 (Multi Block Write) The tests are carried out on a 64Gb emmc device. All of these tests try to access an "out of range" sector address (0x09B2FFFF). It is seen that without the patch the response received by the user is not OUT_OF_RANGE error (R1 response 31st bit is not set) as per JEDEC specification. After applying the patch proper response is seen. This is because the function returns without copying the response to the user in case of failure. This patch fixes the issue. Hence, this memcpy is required whether we get an error response or not. Therefor it is moved up from the current position up to immediately after we have called mmc_wait_for_req(). The test code and the output of only the CMD17 is included in the commit to limit the message length. CMD17 (Test Code Snippet): ========================== printf("Forming CMD%d\n", opt_idx); /* single block read */ cmd.blksz = 512; cmd.blocks = 1; cmd.write_flag = 0; cmd.opcode = 17; //cmd.arg = atoi(argv[3]); cmd.arg = 0x09B2FFFF; /* Expecting response R1B */ cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC; memset(data, 0, sizeof(__u8) * 512); mmc_ioc_cmd_set_data(cmd, data); printf("Sending CMD%d: ARG[0x%08x]\n", opt_idx, cmd.arg); if(ioctl(fd, MMC_IOC_CMD, &cmd)) perror("Error"); printf("\nResponse: %08x\n", cmd.response[0]); CMD17 (Output without patch): ============================= test@test-LIVA-Z:~$ sudo ./mmc cmd_test /dev/mmcblk0 17 Entering the do_mmc_commands:Device: /dev/mmcblk0 nargs:4 Entering the do_mmc_commands:Device: /dev/mmcblk0 options[17, 0x09B2FFF] Forming CMD17 Sending CMD17: ARG[0x09b2ffff] Error: Connection timed out Response: 00000000 (Incorrect response) CMD17 (Output with patch): ========================== test@test-LIVA-Z:~$ sudo ./mmc cmd_test /dev/mmcblk0 17 [sudo] password for test: Entering the do_mmc_commands:Device: /dev/mmcblk0 nargs:4 Entering the do_mmc_commands:Device: /dev/mmcblk0 options[17, 09B2FFFF] Forming CMD17 Sending CMD17: ARG[0x09b2ffff] Error: Connection timed out Response: 80000900 (Correct OUT_OF_ERROR response as per JEDEC specification) Signed-off-by: Nishad Kamdar Reviewed-by: Avri Altman Link: https://lore.kernel.org/r/20210824191726.8296-1-nishadkamdar@gmail.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/block.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index a9ad9f5fa949..c3ecec3f6ddc 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -518,6 +518,7 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, return mmc_sanitize(card, idata->ic.cmd_timeout_ms); mmc_wait_for_req(card->host, &mrq); + memcpy(&idata->ic.response, cmd.resp, sizeof(cmd.resp)); if (cmd.error) { dev_err(mmc_dev(card->host), "%s: cmd error %d\n", @@ -567,8 +568,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, if (idata->ic.postsleep_min_us) usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us); - memcpy(&(idata->ic.response), cmd.resp, sizeof(cmd.resp)); - if (idata->rpmb || (cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) { /* * Ensure RPMB/R1B command has completed by polling CMD13 -- 2.30.2