diff options
| author | Peter Maydell | 2017-07-10 11:29:11 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-10 11:29:11 +0200 |
| commit | 77d472291812cf04f97974dadbda767e59e31fde (patch) | |
| tree | 50dd98f02bd609d870d0d49460749b07a7462018 /hw/xen/xen_pt.c | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170706' into s... (diff) | |
| parent | xen/pt: Fixup addr validation in xen_pt_pci_config_access_check (diff) | |
| download | qemu-77d472291812cf04f97974dadbda767e59e31fde.tar.gz qemu-77d472291812cf04f97974dadbda767e59e31fde.tar.xz qemu-77d472291812cf04f97974dadbda767e59e31fde.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170707-tag' into staging
Xen 2017/07/07
# gpg: Signature made Fri 07 Jul 2017 19:21:22 BST
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg: aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20170707-tag:
xen/pt: Fixup addr validation in xen_pt_pci_config_access_check
xen-platform: Cleanup network infrastructure when emulated NICs are unplugged
xenfb: remove xen_init_display "temporary" hack
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/xen/xen_pt.c')
| -rw-r--r-- | hw/xen/xen_pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index b6d71bb52a..375efa68f6 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -85,7 +85,7 @@ void xen_pt_log(const PCIDevice *d, const char *f, ...) static int xen_pt_pci_config_access_check(PCIDevice *d, uint32_t addr, int len) { /* check offset range */ - if (addr >= 0xFF) { + if (addr > 0xFF) { XEN_PT_ERR(d, "Failed to access register with offset exceeding 0xFF. " "(addr: 0x%02x, len: %d)\n", addr, len); return -1; |