diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-31 10:28:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-31 10:28:13 +0100 |
| commit | d74824cf7c8b352f9045e949dc636c7207a41eee (patch) | |
| tree | fa9912258f9d9901f840ca4a3be8ddbced68d844 | |
| parent | 1448629751871c4924c234c2faaa968fc26890e1 (diff) | |
| parent | 148d25e0f6ad1dc3bd6aace092d65262d4217ec6 (diff) | |
| download | qemu-d74824cf7c8b352f9045e949dc636c7207a41eee.zip qemu-d74824cf7c8b352f9045e949dc636c7207a41eee.tar.gz qemu-d74824cf7c8b352f9045e949dc636c7207a41eee.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200731' into staging
Fix a problem introduced in a recent fix.
# gpg: Signature made Fri 31 Jul 2020 09:50:28 BST
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20200731:
s390x/s390-virtio-ccw: fix off-by-one in loadparm getter
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 403d30e..e72c61d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -701,12 +701,9 @@ bool hpage_1m_allowed(void) static char *machine_get_loadparm(Object *obj, Error **errp) { S390CcwMachineState *ms = S390_CCW_MACHINE(obj); - char *loadparm_str; /* make a NUL-terminated string */ - loadparm_str = g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1); - loadparm_str[sizeof(ms->loadparm)] = 0; - return loadparm_str; + return g_strndup((char *) ms->loadparm, sizeof(ms->loadparm)); } static void machine_set_loadparm(Object *obj, const char *val, Error **errp) |