Commit a82e484e authored Jun 05, 2013 by Yaniv Gardi Committed by Chris Ball Jun 27, 2013

mmc: card: fixing an false identification of SANITIZE command



Inside the routine mmc_blk_ioctl_cmd() the sanitize command is
identified according to the value of bits 16-23 of the argument.

but what happens if a different command is sent, and only by
chance, bits 16-23 contain the value of SANITIZE command ?
In that case a SANITIZE command will be falsely identified.
In order to prevent such a case, the condition is expanded and
now it also checks the opcode itself, and verifies that it is an
MMC_SWITCH opcode.

Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent 4d156d50

drivers/mmc/card/block.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,8 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
		goto cmd_rel_host;
		}

		if (MMC_EXTRACT_INDEX_FROM_ARG(cmd.arg) == EXT_CSD_SANITIZE_START) {
		if ((MMC_EXTRACT_INDEX_FROM_ARG(cmd.arg) == EXT_CSD_SANITIZE_START) &&
		(cmd.opcode == MMC_SWITCH)) {
		err = ioctl_do_sanitize(card);

		if (err)