linux-kernel - Re: [PATCHv2] mmc: block: remove non-data R1B ioctl workaround

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <8f2329cf-d482-7147-bd72-b8832e9bf123@intel.com>
Date:   Tue, 29 Nov 2022 14:36:50 +0200
From:   Adrian Hunter <adrian.hunter@...el.com>
To:     Christian Löhle <CLoehle@...erstone.com>,
        Avri Altman <Avri.Altman@....com>,
        "ulf.hansson@...aro.org" <ulf.hansson@...aro.org>,
        "linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCHv2] mmc: block: remove non-data R1B ioctl workaround

On 27/11/22 19:46, Christian Löhle wrote:
> The workaround of pretending R1B non-data transfers are
> data transfers in order for the busy timeout to be respected
> by the host controller driver is removed. It wasn't useful
> in a long time.
> 
> Initially the workaround ensured that R1B commands did not
> time out by setting the data timeout to be the command timeout
> in commit cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl").
> This was moved inside of an if clause with idata->buf_bytes being set
> in commit 4d6144de8ba2 ("mmc: core: check for zero length ioctl data").
> Since the workaround is now inside of the idata->buf_bytes clause
> and intended to fix R1B non-data transfers that do not have buf_bytes
> set we can also remove the workaround altogether.
> Since there are no data transfer invoking R1B commands this was dead
> code.
> 
> Fixes: cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl")
> Signed-off-by: Christian Loehle <cloehle@...erstone.com>

Doesn't Fixes: 4d6144de8ba2 make more sense?

Otherwise:

Acked-by: Adrian Hunter <adrian.hunter@...el.com>

> ---
> -v2: clarified commit message, no code change
>  drivers/mmc/core/block.c | 13 -------------
>  1 file changed, 13 deletions(-)
> 
> diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
> index db6d8a099910..20da7ed43e6d 100644
> --- a/drivers/mmc/core/block.c
> +++ b/drivers/mmc/core/block.c
> @@ -514,19 +514,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
>  		if (idata->ic.data_timeout_ns)
>  			data.timeout_ns = idata->ic.data_timeout_ns;
>  
> -		if ((cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
> -			/*
> -			 * Pretend this is a data transfer and rely on the
> -			 * host driver to compute timeout.  When all host
> -			 * drivers support cmd.cmd_timeout for R1B, this
> -			 * can be changed to:
> -			 *
> -			 *     mrq.data = NULL;
> -			 *     cmd.cmd_timeout = idata->ic.cmd_timeout_ms;
> -			 */
> -			data.timeout_ns = idata->ic.cmd_timeout_ms * 1000000;
> -		}
> -
>  		mrq.data = &data;
>  	}
>