Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b0e77bd authored by Jens Axboe's avatar Jens Axboe Committed by Linus Torvalds
Browse files

[PATCH] scsi_ioctl: only warn for rejected commands 



We should not be warning about commands that we allow, even if they are
unknown. So move the if-root-allow check up a notch.

Signed-off-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8aa19ad8

drivers/block/scsi_ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -201,15 +201,15 @@ static int verify_command(struct file *file, unsigned char *cmd) 
			return 0;

	}



	/* And root can do any command.. */

	if (capable(CAP_SYS_RAWIO))

		return 0;



	if (!type) {

		cmd_type[cmd[0]] = CMD_WARNED;

		printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);

	}



	/* And root can do any command.. */

	if (capable(CAP_SYS_RAWIO))

		return 0;



	/* Otherwise fail it with an "Operation not permitted" */

	return -EPERM;

}