提交 d6645483 编写于 作者: H Halil Pasic 提交者: Cornelia Huck

s390x/s390-virtio-ccw: fix loadparm property getter

The function machine_get_loadparm() is supposed to produce a C-string,
that is a NUL-terminated one, but it does not. ElectricFence can detect
this problem if the loadparm machine property is used.

Let us make the returned string a NUL-terminated one.

Fixes: 7104bae9 ("hw/s390x: provide loadparm property for the machine")
Signed-off-by: NHalil Pasic <pasic@linux.ibm.com>
Reviewed-by: NThomas Huth <thuth@redhat.com>
Message-Id: <20200723162717.88485-1-pasic@linux.ibm.com>
Signed-off-by: NCornelia Huck <cohuck@redhat.com>
上级 d1bb69db
......@@ -701,8 +701,12 @@ bool hpage_1m_allowed(void)
static char *machine_get_loadparm(Object *obj, Error **errp)
{
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
char *loadparm_str;
return g_memdup(ms->loadparm, sizeof(ms->loadparm));
/* make a NUL-terminated string */
loadparm_str = g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1);
loadparm_str[sizeof(ms->loadparm)] = 0;
return loadparm_str;
}
static void machine_set_loadparm(Object *obj, const char *val, Error **errp)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册