ba97ec0138
Update to v5.1.0 qemu OBS-URL: https://build.opensuse.org/request/show/825860 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=557
58 lines
3.5 KiB
Diff
58 lines
3.5 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Wed, 15 May 2019 13:32:01 -0600
|
|
Subject: hw/intc/exynos4210_gic: provide more room when formatting alias names
|
|
|
|
sprintf related parameter validation complains about the size of the
|
|
buffer being written to in exynos4210_gic_realize(). Provide a bit more
|
|
space to avoid the following warning:
|
|
/home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c: In function 'exynos4210_gic_realize':
|
|
/home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c:316:36: error: '%x' directive writing between 1 and 7 bytes into a region of size between 4 and 28 [-Werror=format-overflow=]
|
|
316 | sprintf(cpu_alias_name, "%s%x", cpu_prefix, i);
|
|
| ^~
|
|
/home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c:316:33: note: directive argument in the range [0, 29020050]
|
|
316 | sprintf(cpu_alias_name, "%s%x", cpu_prefix, i);
|
|
| ^~~~~~
|
|
In file included from /usr/include/stdio.h:867,
|
|
from /home/abuild/rpmbuild/BUILD/qemu-4.0.0/include/qemu/osdep.h:99,
|
|
from /home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c:23:
|
|
/usr/include/bits/stdio2.h:36:10: note: '__builtin___sprintf_chk' output between 2 and 32 bytes into a destination of size 28
|
|
36 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
|
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
37 | __bos (__s), __fmt, __va_arg_pack ());
|
|
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
/home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c:326:37: error: '%x' directive writing between 1 and 7 bytes into a region of size between 3 and 28 [-Werror=format-overflow=]
|
|
326 | sprintf(dist_alias_name, "%s%x", dist_prefix, i);
|
|
| ^~
|
|
/home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c:326:34: note: directive argument in the range [0, 29020050]
|
|
326 | sprintf(dist_alias_name, "%s%x", dist_prefix, i);
|
|
| ^~~~~~
|
|
In file included from /usr/include/stdio.h:867,
|
|
from /home/abuild/rpmbuild/BUILD/qemu-4.0.0/include/qemu/osdep.h:99,
|
|
from /home/abuild/rpmbuild/BUILD/qemu-4.0.0/hw/intc/exynos4210_gic.c:23:
|
|
/usr/include/bits/stdio2.h:36:10: note: '__builtin___sprintf_chk' output between 2 and 33 bytes into a destination of size 28
|
|
36 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1,
|
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
37 | __bos (__s), __fmt, __va_arg_pack ());
|
|
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/intc/exynos4210_gic.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
|
|
index 0aa3b843a9e045348b719cb4b8a4..83506dda3c9142350319d7f4dd5c 100644
|
|
--- a/hw/intc/exynos4210_gic.c
|
|
+++ b/hw/intc/exynos4210_gic.c
|
|
@@ -291,8 +291,8 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp)
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
const char cpu_prefix[] = "exynos4210-gic-alias_cpu";
|
|
const char dist_prefix[] = "exynos4210-gic-alias_dist";
|
|
- char cpu_alias_name[sizeof(cpu_prefix) + 3];
|
|
- char dist_alias_name[sizeof(cpu_prefix) + 3];
|
|
+ char cpu_alias_name[sizeof(cpu_prefix) + 7];
|
|
+ char dist_alias_name[sizeof(cpu_prefix) + 8];
|
|
SysBusDevice *gicbusdev;
|
|
uint32_t n = s->num_cpu;
|
|
uint32_t i;
|