From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Ed Maste" <emaste@FreeBSD.org>,
qemu-block@nongnu.org,
"Gustavo A . R . Silva" <gustavo@embeddedor.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Daniele Buono" <dbuono@linux.vnet.ibm.com>,
"Han Han" <hhan@redhat.com>
Subject: [RFC PATCH 2/2] hw/usb/dev-uas: Report command additional adb length as unsupported
Date: Mon, 18 Jan 2021 18:03:08 +0100 [thread overview]
Message-ID: <20210118170308.282442-3-philmd@redhat.com> (raw)
In-Reply-To: <20210118170308.282442-1-philmd@redhat.com>
We are not ready to handle additional CDB data.
If a guest send a packet with such additional data,
report the command parameter as not supported.
We can then explicit there is nothing in this additional
buffer, by fixing its size to zero.
This fixes an error when building with Clang 11:
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: Daniele Buono <dbuono@linux.vnet.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Ed Maste <emaste@FreeBSD.org>
Cc: Han Han <hhan@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
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..b6434ad4b9c 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[0]; /* 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
next prev parent reply other threads:[~2021-01-18 17:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 17:03 [RFC PATCH 0/2] hw/usb/dev-uas: Fix Clang 11 -Wgnu-variable-sized-type-not-at-end error Philippe Mathieu-Daudé
2021-01-18 17:03 ` [RFC PATCH 1/2] scsi/utils: Add INVALID_PARAM_VALUE sense code definition Philippe Mathieu-Daudé
2021-01-20 14:58 ` Eric Blake
2021-01-20 16:01 ` Gerd Hoffmann
2021-01-20 16:04 ` Philippe Mathieu-Daudé
2021-01-18 17:03 ` Philippe Mathieu-Daudé [this message]
2021-01-19 23:28 ` [RFC PATCH 2/2] hw/usb/dev-uas: Report command additional adb length as unsupported Philippe Mathieu-Daudé
2021-01-20 14:11 ` Eric Blake
2021-01-19 16:41 ` [RFC PATCH 0/2] hw/usb/dev-uas: Fix Clang 11 -Wgnu-variable-sized-type-not-at-end error Gerd Hoffmann
2021-01-19 16:49 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118170308.282442-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=dbuono@linux.vnet.ibm.com \
--cc=emaste@FreeBSD.org \
--cc=fam@euphon.net \
--cc=gustavo@embeddedor.com \
--cc=hhan@redhat.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.