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

Commit c85dcdac authored by Alan Stern's avatar Alan Stern Committed by Felipe Balbi
Browse files

USB: gadget: storage gadgets send wrong error code for unknown commands 



This patch (as1539) fixes a minor bug in the mass-storage gadget
drivers.  When an unknown command is received, the error code sent
back is "Invalid Field in CDB" rather than "Invalid Command".  This is
because the bitmask of CDB bytes allowed to be nonzero is incorrect.

When handling an unknown command, we don't care which command bytes
are nonzero.  All the bits in the mask should be set, not just eight
of them.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: <Michal Nazarewicz <mina86@mina86.com>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 662c738d

drivers/usb/gadget/f_mass_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,7 @@ unknown_cmnd: 
		common->data_size_from_cmnd = 0;

		sprintf(unknown, "Unknown x%02x", common->cmnd[0]);

		reply = check_command(common, common->cmnd_size,

				      DATA_DIR_UNKNOWN, 0xff, 0, unknown);

				      DATA_DIR_UNKNOWN, ~0, 0, unknown);

		if (reply == 0) {

			common->curlun->sense_data = SS_INVALID_COMMAND;

			reply = -EINVAL;

drivers/usb/gadget/file_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -2579,7 +2579,7 @@ static int do_scsi_command(struct fsg_dev *fsg) 
		fsg->data_size_from_cmnd = 0;

		sprintf(unknown, "Unknown x%02x", fsg->cmnd[0]);

		if ((reply = check_command(fsg, fsg->cmnd_size,

				DATA_DIR_UNKNOWN, 0xff, 0, unknown)) == 0) {

				DATA_DIR_UNKNOWN, ~0, 0, unknown)) == 0) {

			fsg->curlun->sense_data = SS_INVALID_COMMAND;

			reply = -EINVAL;

		}