diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 16:40:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 16:40:56 +0100 |
| commit | edf6ea6fbe793b017a9765b493d7b1675a16a42f (patch) | |
| tree | 6c975cd910a5c2b74cc4ba77b2a070c40b3807ca /hw/usb/u2f-emulated.c | |
| parent | 834b9273d5cdab68180dc8c84d641aaa4344b057 (diff) | |
| parent | 1be90ebecc95b09a2ee5af3f60c412b45a766c4f (diff) | |
| download | focaccia-qemu-edf6ea6fbe793b017a9765b493d7b1675a16a42f.tar.gz focaccia-qemu-edf6ea6fbe793b017a9765b493d7b1675a16a42f.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200921-pull-request' into staging
usb: fix u2f build usb: fix ohci oob access and loop issues # gpg: Signature made Mon 21 Sep 2020 09:58:06 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/usb-20200921-pull-request: hw: usb: hcd-ohci: check for processed TD before retire hw: usb: hcd-ohci: check len and frame_number variables usb: fix u2f build Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/u2f-emulated.c')
| -rw-r--r-- | hw/usb/u2f-emulated.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c index 9e1b829f3d..9151feb63d 100644 --- a/hw/usb/u2f-emulated.c +++ b/hw/usb/u2f-emulated.c @@ -200,7 +200,7 @@ static ssize_t u2f_emulated_read(const char *path, char *buffer, int fd; ssize_t ret; - fd = qemu_open(path, O_RDONLY); + fd = qemu_open_old(path, O_RDONLY); if (fd < 0) { return -1; } @@ -217,7 +217,7 @@ static bool u2f_emulated_setup_counter(const char *path, int fd, ret; FILE *fp; - fd = qemu_open(path, O_RDWR); + fd = qemu_open_old(path, O_RDWR); if (fd < 0) { return false; } |