[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/10] qdev: Change Property::offset field to ptrd
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 01/10] qdev: Change Property::offset field to ptrdiff_t type |
Date: |
Thu, 19 Nov 2015 15:35:59 +0100 |
From: Ildar Isaev <address@hidden>
Property::offset field is calculated as a diff between two pointers:
arrayprop->prop.offset = eltptr - (void *)dev;
If offset is declared as int, this subtraction can cause type overflow,
thus leading to failure of the subsequent assertion:
assert(qdev_get_prop_ptr(dev, &arrayprop->prop) == eltptr);
So ptrdiff_t should be used instead.
Signed-off-by: Ildar Isaev <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
include/hw/qdev-core.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index e6dbde4..c537969 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -237,7 +237,7 @@ struct BusState {
struct Property {
const char *name;
PropertyInfo *info;
- int offset;
+ ptrdiff_t offset;
uint8_t bitnr;
qtype_code qtype;
int64_t defval;
--
2.6.2
- [Qemu-devel] [PULL for-2.5 v2 00/10] QOM devices patch queue 2015-11-19, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 01/10] qdev: Change Property::offset field to ptrdiff_t type,
Andreas Färber <=
- [Qemu-devel] [PULL v2 03/10] qmp: Convert QMP code to use object property iterators, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 09/10] qom: Clean up assertions to display values on failure, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 05/10] ppc: Convert spapr code to use object property iterators, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 10/10] MAINTAINERS: Add check-qom-{interface, proplist} to QOM, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 04/10] vl: Convert machine help code to use object property iterators, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 06/10] net: Convert net filter code to use object property iterators, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 07/10] qom: Add a test case for complex property finalization, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 02/10] qom: Introduce ObjectPropertyIterator struct for iteration, Andreas Färber, 2015/11/19
- [Qemu-devel] [PULL v2 08/10] qom: Replace object property list with GHashTable, Andreas Färber, 2015/11/19
- Re: [Qemu-devel] [PULL for-2.5 v2 00/10] QOM devices patch queue 2015-11-19, Peter Maydell, 2015/11/19