aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorHongren (Zenithal) Zheng <i@zenithal.me>2022-06-13 20:14:19 +0800
committerGerd Hoffmann <kraxel@redhat.com>2022-07-01 12:37:36 +0200
commitada270cd18723c575120c379d0234a1eafeba3dc (patch)
tree37e06d2b0b1ac09ce976072457b1afca63fee364 /hw
parent8c0d80245f3cdbbe6003844751d8fc6b1db7b1e4 (diff)
downloadqemu-ada270cd18723c575120c379d0234a1eafeba3dc.zip
qemu-ada270cd18723c575120c379d0234a1eafeba3dc.tar.gz
qemu-ada270cd18723c575120c379d0234a1eafeba3dc.tar.bz2
hw/usb/canokey: Fix CCID ZLP
CCID could send zero-length packet (ZLP) if we invoke two data_in, two packets would be concated and we could not distinguish them. The CANOKEY_EMU_EP_CTAPHID is imported from canokey-qemu.h Reported-by: MkfsSion <myychina28759@gmail.com> Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me> Message-Id: <YqcqGz0s3+LE42ms@Sun> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/usb/canokey.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c
index 4a08b1c..8654892 100644
--- a/hw/usb/canokey.c
+++ b/hw/usb/canokey.c
@@ -109,11 +109,10 @@ int canokey_emu_transmit(
* Note: this is a quirk for CanoKey CTAPHID
* because it calls multiple emu_transmit in one device_loop
* but w/o data_in it would stuck in device_loop
- * This has no side effect for CCID as it is strictly
- * OUT then IN transfer
- * However it has side effect for Control transfer
+ * This has side effect for CCID since CCID can send ZLP
+ * This also has side effect for Control transfer
*/
- if (ep_in != 0) {
+ if (ep_in == CANOKEY_EMU_EP_CTAPHID) {
canokey_emu_data_in(ep_in);
}
return 0;