* [PATCH v2 1/3] scsi/utils: Rename 'illegal request' -> 'invalid request'
2021-01-20 15:35 [PATCH v2 0/3] hw/usb/dev-uas: Fix Clang 11 -Wgnu-variable-sized-type-not-at-end error Philippe Mathieu-Daudé
@ 2021-01-20 15:35 ` Philippe Mathieu-Daudé
2021-01-20 15:45 ` Eric Blake
2021-01-20 16:15 ` Gerd Hoffmann
2021-01-20 15:35 ` [PATCH v2 2/3] scsi/utils: Add INVALID_PARAM_VALUE sense code definition Philippe Mathieu-Daudé
2021-01-20 15:35 ` [PATCH v2 3/3] hw/usb/dev-uas: Report command additional adb length as unsupported Philippe Mathieu-Daudé
2 siblings, 2 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-20 15:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Gerd Hoffmann, Paolo Bonzini,
Philippe Mathieu-Daudé
While these requests are invalid, they are not breaking any laws :)
Rename 'illegal request' as 'invalid request'.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/scsi/utils.h | 20 ++++++++++----------
scsi/utils.c | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/scsi/utils.h b/include/scsi/utils.h
index fbc55882799..725769be3cb 100644
--- a/include/scsi/utils.h
+++ b/include/scsi/utils.h
@@ -49,25 +49,25 @@ extern const struct SCSISense sense_code_NO_MEDIUM;
extern const struct SCSISense sense_code_NOT_READY_REMOVAL_PREVENTED;
/* Hardware error, internal target failure */
extern const struct SCSISense sense_code_TARGET_FAILURE;
-/* Illegal request, invalid command operation code */
+/* Invalid request, invalid command operation code */
extern const struct SCSISense sense_code_INVALID_OPCODE;
-/* Illegal request, LBA out of range */
+/* Invalid request, LBA out of range */
extern const struct SCSISense sense_code_LBA_OUT_OF_RANGE;
-/* Illegal request, Invalid field in CDB */
+/* Invalid request, Invalid field in CDB */
extern const struct SCSISense sense_code_INVALID_FIELD;
-/* Illegal request, Invalid field in parameter list */
+/* Invalid request, Invalid field in parameter list */
extern const struct SCSISense sense_code_INVALID_PARAM;
-/* Illegal request, Parameter list length error */
+/* Invalid request, Parameter list length error */
extern const struct SCSISense sense_code_INVALID_PARAM_LEN;
-/* Illegal request, LUN not supported */
+/* Invalid request, LUN not supported */
extern const struct SCSISense sense_code_LUN_NOT_SUPPORTED;
-/* Illegal request, Saving parameters not supported */
+/* Invalid request, Saving parameters not supported */
extern const struct SCSISense sense_code_SAVING_PARAMS_NOT_SUPPORTED;
-/* Illegal request, Incompatible format */
+/* Invalid request, Incompatible format */
extern const struct SCSISense sense_code_INCOMPATIBLE_FORMAT;
-/* Illegal request, medium removal prevented */
+/* Invalid request, medium removal prevented */
extern const struct SCSISense sense_code_ILLEGAL_REQ_REMOVAL_PREVENTED;
-/* Illegal request, Invalid Transfer Tag */
+/* Invalid request, Invalid Transfer Tag */
extern const struct SCSISense sense_code_INVALID_TAG;
/* Command aborted, I/O process terminated */
extern const struct SCSISense sense_code_IO_ERROR;
diff --git a/scsi/utils.c b/scsi/utils.c
index b37c2830148..41ad49459ca 100644
--- a/scsi/utils.c
+++ b/scsi/utils.c
@@ -177,52 +177,52 @@ const struct SCSISense sense_code_TARGET_FAILURE = {
.key = HARDWARE_ERROR, .asc = 0x44, .ascq = 0x00
};
-/* Illegal request, invalid command operation code */
+/* Invalid request, invalid command operation code */
const struct SCSISense sense_code_INVALID_OPCODE = {
.key = ILLEGAL_REQUEST, .asc = 0x20, .ascq = 0x00
};
-/* Illegal request, LBA out of range */
+/* Invalid request, LBA out of range */
const struct SCSISense sense_code_LBA_OUT_OF_RANGE = {
.key = ILLEGAL_REQUEST, .asc = 0x21, .ascq = 0x00
};
-/* Illegal request, Invalid field in CDB */
+/* Invalid request, Invalid field in CDB */
const struct SCSISense sense_code_INVALID_FIELD = {
.key = ILLEGAL_REQUEST, .asc = 0x24, .ascq = 0x00
};
-/* Illegal request, Invalid field in parameter list */
+/* Invalid request, Invalid field in parameter list */
const struct SCSISense sense_code_INVALID_PARAM = {
.key = ILLEGAL_REQUEST, .asc = 0x26, .ascq = 0x00
};
-/* Illegal request, Parameter list length error */
+/* Invalid request, Parameter list length error */
const struct SCSISense sense_code_INVALID_PARAM_LEN = {
.key = ILLEGAL_REQUEST, .asc = 0x1a, .ascq = 0x00
};
-/* Illegal request, LUN not supported */
+/* Invalid request, LUN not supported */
const struct SCSISense sense_code_LUN_NOT_SUPPORTED = {
.key = ILLEGAL_REQUEST, .asc = 0x25, .ascq = 0x00
};
-/* Illegal request, Saving parameters not supported */
+/* Invalid request, Saving parameters not supported */
const struct SCSISense sense_code_SAVING_PARAMS_NOT_SUPPORTED = {
.key = ILLEGAL_REQUEST, .asc = 0x39, .ascq = 0x00
};
-/* Illegal request, Incompatible medium installed */
+/* Invalid request, Incompatible medium installed */
const struct SCSISense sense_code_INCOMPATIBLE_FORMAT = {
.key = ILLEGAL_REQUEST, .asc = 0x30, .ascq = 0x00
};
-/* Illegal request, medium removal prevented */
+/* Invalid request, medium removal prevented */
const struct SCSISense sense_code_ILLEGAL_REQ_REMOVAL_PREVENTED = {
.key = ILLEGAL_REQUEST, .asc = 0x53, .ascq = 0x02
};
-/* Illegal request, Invalid Transfer Tag */
+/* Invalid request, Invalid Transfer Tag */
const struct SCSISense sense_code_INVALID_TAG = {
.key = ILLEGAL_REQUEST, .asc = 0x4b, .ascq = 0x01
};
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/3] scsi/utils: Add INVALID_PARAM_VALUE sense code definition
2021-01-20 15:35 [PATCH v2 0/3] hw/usb/dev-uas: Fix Clang 11 -Wgnu-variable-sized-type-not-at-end error Philippe Mathieu-Daudé
2021-01-20 15:35 ` [PATCH v2 1/3] scsi/utils: Rename 'illegal request' -> 'invalid request' Philippe Mathieu-Daudé
@ 2021-01-20 15:35 ` Philippe Mathieu-Daudé
2021-01-20 15:35 ` [PATCH v2 3/3] hw/usb/dev-uas: Report command additional adb length as unsupported Philippe Mathieu-Daudé
2 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-20 15:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Gerd Hoffmann, Paolo Bonzini,
Philippe Mathieu-Daudé
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/scsi/utils.h | 2 ++
scsi/utils.c | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/include/scsi/utils.h b/include/scsi/utils.h
index 725769be3cb..504cde1cc9b 100644
--- a/include/scsi/utils.h
+++ b/include/scsi/utils.h
@@ -57,6 +57,8 @@ extern const struct SCSISense sense_code_LBA_OUT_OF_RANGE;
extern const struct SCSISense sense_code_INVALID_FIELD;
/* Invalid request, Invalid field in parameter list */
extern const struct SCSISense sense_code_INVALID_PARAM;
+/* Invalid request, Invalid value in parameter list */
+extern const struct SCSISense sense_code_INVALID_PARAM_VALUE;
/* Invalid request, Parameter list length error */
extern const struct SCSISense sense_code_INVALID_PARAM_LEN;
/* Invalid request, LUN not supported */
diff --git a/scsi/utils.c b/scsi/utils.c
index 41ad49459ca..e9082da7420 100644
--- a/scsi/utils.c
+++ b/scsi/utils.c
@@ -197,6 +197,11 @@ const struct SCSISense sense_code_INVALID_PARAM = {
.key = ILLEGAL_REQUEST, .asc = 0x26, .ascq = 0x00
};
+/* Invalid request, Invalid value in parameter list */
+const struct SCSISense sense_code_INVALID_PARAM_VALUE = {
+ .key = ILLEGAL_REQUEST, .asc = 0x26, .ascq = 0x01
+};
+
/* Invalid request, Parameter list length error */
const struct SCSISense sense_code_INVALID_PARAM_LEN = {
.key = ILLEGAL_REQUEST, .asc = 0x1a, .ascq = 0x00
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/3] hw/usb/dev-uas: Report command additional adb length as unsupported
2021-01-20 15:35 [PATCH v2 0/3] hw/usb/dev-uas: Fix Clang 11 -Wgnu-variable-sized-type-not-at-end error Philippe Mathieu-Daudé
2021-01-20 15:35 ` [PATCH v2 1/3] scsi/utils: Rename 'illegal request' -> 'invalid request' Philippe Mathieu-Daudé
2021-01-20 15:35 ` [PATCH v2 2/3] scsi/utils: Add INVALID_PARAM_VALUE sense code definition Philippe Mathieu-Daudé
@ 2021-01-20 15:35 ` Philippe Mathieu-Daudé
2021-01-21 11:14 ` Gerd Hoffmann
2 siblings, 1 reply; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-20 15:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Ed Maste, qemu-block, Gustavo A . R . Silva,
Gerd Hoffmann, Marc-André Lureau, Paolo Bonzini,
Philippe Mathieu-Daudé, Daniele Buono, Han Han
We are not ready to handle additional CDB data.
If a guest sends a packet with such additional data,
report the command parameter as not supported.
Specify a size (of 1 byte) for the add_cdb member we
are not using, to fix the following warning:
usb/dev-uas.c:157:31: error: field 'status' with variable sized type 'uas_iu' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
uas_iu status;
^
Reported-by: Ed Maste <emaste@FreeBSD.org>
Reported-by: Daniele Buono <dbuono@linux.vnet.ibm.com>
Reported-by: Han Han <hhan@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gustavo A. R. Silva <gustavo@embeddedor.com>
v2: include Eric feedbacks
---
hw/usb/dev-uas.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index cec071d96c4..a51402bc0bf 100644
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -16,6 +16,7 @@
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
+#include "qemu/log.h"
#include "hw/usb.h"
#include "migration/vmstate.h"
@@ -70,7 +71,7 @@ typedef struct {
uint8_t reserved_2;
uint64_t lun;
uint8_t cdb[16];
- uint8_t add_cdb[];
+ uint8_t add_cdb[1]; /* not supported by QEMU */
} QEMU_PACKED uas_iu_command;
typedef struct {
@@ -700,6 +701,11 @@ static void usb_uas_command(UASDevice *uas, uas_iu *iu)
uint32_t len;
uint16_t tag = be16_to_cpu(iu->hdr.tag);
+ if (iu->command.add_cdb_length > 0) {
+ qemu_log_mask(LOG_UNIMP, "additional adb length not yet supported\n");
+ goto unsupported_len;
+ }
+
if (uas_using_streams(uas) && tag > UAS_MAX_STREAMS) {
goto invalid_tag;
}
@@ -735,6 +741,10 @@ static void usb_uas_command(UASDevice *uas, uas_iu *iu)
}
return;
+unsupported_len:
+ usb_uas_queue_fake_sense(uas, tag, sense_code_INVALID_PARAM_VALUE);
+ return;
+
invalid_tag:
usb_uas_queue_fake_sense(uas, tag, sense_code_INVALID_TAG);
return;
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread