mmc: block: Fix 4K native sector check (5be80375) · Commits · 戴 / test

The 4K native sector check does not allow for the 'do' loop nor the variables used after the 'cmd_abort' label. 'brq' and 'req' get reassigned in the 'do' loop, so the check must not assume what their values are. After the 'cmd_abort' label, 'mq_rq' and 'req' are used, but 'rqc' must be NULL otherwise it can be started again. Signed-off-by:

Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/card/block.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -1597,11 +1597,11 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue mq, struct request rqc)
		{
		struct mmc_blk_data *md = mq->blkdata;
		struct mmc_card *card = md->queue.card;
		struct mmc_blk_request *brq = &mq->mqrq_cur->brq;
		struct mmc_blk_request *brq;
		int ret = 1, disable_multi = 0, retry = 0, type, retune_retry_done = 0;
		enum mmc_blk_status status;
		struct mmc_queue_req *mq_rq;
		struct request *req = rqc;
		struct request *req;
		struct mmc_async_req *areq;

		if (!rqc && !mq->mqrq_prev->req)
		@@ -1616,8 +1616,10 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue mq, struct request rqc)
		if (mmc_large_sector(card) &&
		!IS_ALIGNED(blk_rq_sectors(rqc), 8)) {
		pr_err("%s: Transfer size is not 4KB sector size aligned\n",
		req->rq_disk->disk_name);
		rqc->rq_disk->disk_name);
		mq_rq = mq->mqrq_cur;
		req = rqc;
		rqc = NULL;
		goto cmd_abort;
		}

Admin message