Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1733519pxb; Thu, 16 Sep 2021 14:17:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2amBggjQOplJ3wK1W6QsXz36PdbaqtleN5lv2zkzQKpGKZUZLVJj8B/dvFpOFt6rCf8pR X-Received: by 2002:a5e:9819:: with SMTP id s25mr6070676ioj.63.1631827023293; Thu, 16 Sep 2021 14:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631827023; cv=none; d=google.com; s=arc-20160816; b=I35oqgaJ375or64YwH7nRgnDHLtc8K756TBkN1b/U2XL8C+RmDyaRNZziGm+LbgzuA ckkMA2WlQuZ42Qhm7S/poyOodnpBRxYdChh44VYDxTvgyQwgjSR/1CXeSg4sDr7Y+rLG kEML6fuAetSbFgxiWndo4m3X7vgANeUjsww4lhky3Paehn7eCsFxh9dikZpanK0r4TYq lgG5bP9fgjisY2uwsUyspvzSwllryeVPxaU8xxNxllsFg64Q/coTs1JfS5KXKh0x2Zon u569ytherWQEYkCvvhqhvKra1V0mFuc6JppPVwYsCP5rtDnO6q4u+gHOEgoBZZeLCdse lswQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pvKTazafNDV08NwpbHTT9hJwRsXOkpcXzGeGKENu4VM=; b=kzFdVt/JHbV3hQBAWq0fhzYW6ufz79oPHwSI/owwar5bBRl+fBtyhfl8/RO9LC51d/ MjU7SrIGfgwJanhOfNWJChUIUmOzIc8TkUR+oVAUNZNW2BEZEgnrkOqXTlAVUFq0BeQS GoP2GyatKKkvwK+PmUCgYp6kjanLECFHqtmuULyNfFlN+TPslNnolMAUIpv5NLsGqBAc xajNrXeA5OwZY12U0AExxS1xCdoqV7M+vpVA839lMis/Gsm4y1sjCQv8HKWpGBDQXy+L dpFjvmMgOcFXLCcb6piv3aFJ0TPjgVg7fIPJ4jdU5Vkk5Y5E3exoNPJSH52kgkwAXKCn JR4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DbyoRAKV; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b8si4094209ios.12.2021.09.16.14.16.52; Thu, 16 Sep 2021 14:17:03 -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=@linuxfoundation.org header.s=korg header.b=DbyoRAKV; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242963AbhIPQb6 (ORCPT + 99 others); Thu, 16 Sep 2021 12:31:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:59302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239990AbhIPQXi (ORCPT ); Thu, 16 Sep 2021 12:23:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A69961440; Thu, 16 Sep 2021 16:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808953; bh=ob+Bb539B7NXrWQr+Oio9Fibby6qUmEV0uQFbPqPY34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DbyoRAKVQdnoXZJ2sUOWq8t1ZaSU9EdEThJeKcUDqfb5JHi/jjYUScZF/9wP9fyvq Fae3dwQIK6WVaOaa0WFbMBrCa8BZQ8H4Xa+teVyBF5uHcdHS+rTBhjQfNbDe++qx0d qCCcwCHj/icSxshnYyU7WUHs/e7yqAyknMySPY8k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nishad Kamdar , Avri Altman , Ulf Hansson , Sasha Levin Subject: [PATCH 5.10 251/306] mmc: core: Return correct emmc response in case of ioctl error Date: Thu, 16 Sep 2021 17:59:56 +0200 Message-Id: <20210916155802.627835137@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 87bac9920702..94caee49da99 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -541,6 +541,7 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, return mmc_sanitize(card); 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", @@ -590,8 +591,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