From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: stefano.stabellini@eu.citrix.com, xen-devel@lists.xenproject.org,
qemu-devel@nongnu.org
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [Qemu-devel] [PATCH RFC 1 3/8] xen/pt: Check if reg->init is past the reg->size
Date: Mon, 29 Jun 2015 17:02:00 -0400 [thread overview]
Message-ID: <1435611725-15161-4-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1435611725-15161-1-git-send-email-konrad.wilk@oracle.com>
It should never happen, but in case it does we want to
report. The code will only write up to reg->size so there
is no runtime danger.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
hw/xen/xen_pt_config_init.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 91c3a14..bc871c9 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -1901,9 +1901,13 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s,
} else
val = data;
+ if (val & size_mask) {
+ XEN_PT_ERR(&s->dev,"Offset 0x%04x:0x%04u expands past register size(%d)!\n",
+ offset, val, reg->size);
+ }
/* This could be just pci_set_long as we don't modify the bits
- * past reg->size, but in case this routine is run in parallel
- * we do not want to over-write other registers. */
+ * past reg->size, but in case this routine is run in parallel or the
+ * init value is larger, we do not want to over-write registers. */
switch (reg->size) {
case 1: pci_set_byte(s->dev.config + offset, (uint8_t)val); break;
case 2: pci_set_word(s->dev.config + offset, (uint16_t)val); break;
--
2.1.0
next prev parent reply other threads:[~2015-06-29 21:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-29 21:01 [Qemu-devel] [PATCH RFC v1] Sync dev.config with XenPTReg->data field Konrad Rzeszutek Wilk
2015-06-29 21:01 ` [Qemu-devel] [PATCH RFC 1 1/8] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config Konrad Rzeszutek Wilk
2015-07-01 13:28 ` Stefano Stabellini
2015-06-29 21:01 ` [Qemu-devel] [PATCH RFC 1 2/8] xen/pt: Sync up the dev.config and data values Konrad Rzeszutek Wilk
2015-07-01 13:48 ` Stefano Stabellini
2015-06-29 21:02 ` Konrad Rzeszutek Wilk [this message]
2015-07-01 13:54 ` [Qemu-devel] [PATCH RFC 1 3/8] xen/pt: Check if reg->init is past the reg->size Stefano Stabellini
2015-06-29 21:02 ` [Qemu-devel] [PATCH RFC 1 4/8] xen/pt: Log xen_host_pci_get in two init functions Konrad Rzeszutek Wilk
2015-07-01 13:56 ` Stefano Stabellini
2015-06-29 21:02 ` [Qemu-devel] [PATCH RFC 1 5/8] xen/pt: Log xen_host_pci_get/set errors in MSI code Konrad Rzeszutek Wilk
2015-07-01 13:58 ` Stefano Stabellini
2015-06-29 21:02 ` [Qemu-devel] [PATCH RFC 1 6/8] xen/pt: Make xen_pt_unregister_device idempotent Konrad Rzeszutek Wilk
2015-07-01 14:04 ` Stefano Stabellini
2015-07-02 18:54 ` [Qemu-devel] [Xen-devel] " Konrad Rzeszutek Wilk
2015-07-14 11:38 ` Stefano Stabellini
2015-06-29 21:02 ` [Qemu-devel] [PATCH RFC 1 7/8] xen/pt: Move bulk of xen_pt_unregister_device in its own routine Konrad Rzeszutek Wilk
2015-07-01 14:05 ` Stefano Stabellini
2015-06-29 21:02 ` [Qemu-devel] [PATCH RFC 1 8/8] xen/pt: Check for return values for xen_host_pci_[get|set] in init Konrad Rzeszutek Wilk
2015-07-01 14:06 ` Stefano Stabellini
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=1435611725-15161-4-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xenproject.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).