s390x/s390-virtio-ccw: fix off-by-one in loadparm getter
PATCH v2 1/1 s390x/s390-virtio-ccw: fix off-by-one in loadparm getter
As pointed out by Peter, g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1) reads one past of the end of ms->loadparm, so g_memdup() can not be used here.
Let's use g_strndup instead!
--- hw/s390x/s390-virtio-ccw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
hw/s390x/s390-virtio-ccw.c +1 -4
@@ -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)
base-commit: 5772f2b1fc5d00e7e04e01fa28e9081d6550440a
Signature · 1 line
2.17.1
Quoted 21 lines · Halil Pasic
As pointed out by Peter,
g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1)reads one past of the end ofms->loadparm, sog_memdup()can not be used here.Let's use
g_strndupinstead!Fixes d664548328 ("s390x/s390-virtio-ccw: fix loadparm property getter")Fixes Coverity CID 1431058Reported-by Peter Maydell <[email protected]>Signed-off-by Halil Pasic <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -701,12 +701,9 @@ bool hpage_1m_allowed(void)static char *machine_get_loadparm (Object *obj,Error **errp)
hw/s390x/s390-virtio-ccw.c bool hpage_1m_allowed(void) · line 707
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-4{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)); }
thanks
-- PMM
Quoted 33 lines · Halil Pasic
As pointed out by Peter,
g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1)reads one past of the end ofms->loadparm, sog_memdup()can not be used here.Let's use
g_strndupinstead!Fixes d664548328 ("s390x/s390-virtio-ccw: fix loadparm property getter")Fixes Coverity CID 1431058Reported-by Peter Maydell <[email protected]>Signed-off-by Halil Pasic <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)hw/s390x/s390-virtio-ccw.c +1
-4@@ -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)
Quoted 2 lines
base-commit:
5772f2b1fc5d00e7e04e01fa28e9081d6550440a
Signature · 3 lines
Thanks, David / dhildenb
Quoted 6 lines · On Thu, 30 Jul 2020 15:01:56 +0200 Halil Pasic <[email protected]> wrote:
As pointed out by Peter,
g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1)reads one past of the end ofms->loadparm, sog_memdup()can not be used here.Let's use
g_strndupinstead!
Quoted 7 lines
Fixes d664548328 ("s390x/s390-virtio-ccw: fix loadparm property getter")Fixes Coverity CID 1431058Reported-by Peter Maydell <[email protected]>Signed-off-by Halil Pasic <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
Thanks, queued to s390-fixes.