s390/ipl: fix off-by-one in update_machine_ipl_properties()
PATCH 1/1 s390/ipl: fix off-by-one in update_machine_ipl_properties()
In update_machine_ipl_properties() the array ascii_loadparm needs to hold the 8 char lodparm and a string terminating zero char.
Let's increase the size of ascii_loadparm accordingly.
--- hw/s390x/ipl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/s390x/ipl.c +1 -1
@@ -546,7 +546,7 @@ static void update_machine_ipl_properties(IplParameterBlock *iplb)/* Sync loadparm */ if (iplb->flags &DIAG308_FLAGS_LP_VALID ) {uint8_t *ebcdic_loadparm = iplb->loadparm; -char ascii_loadparm[8 ]; +char ascii_loadparm[9 ];int i;for (i =0 ; i <8 && ebcdic_loadparm[i]; i++) {
base-commit: 226cd20706e20264c176f8edbaf17d7c9b7ade4a
Signature · 1 line
2.17.1
Quoted 2 lines · On Fri, 20 Mar 2020 15:31:01 +0100 Halil Pasic <[email protected]> wrote:
In
update_machine_ipl_properties()the arrayascii_loadparmneeds to hold the 8 char lodparm and a string terminating zero char.
s/lodparm/loadparm/
Quoted 4 lines
Let's increase the size of
ascii_loadparmaccordingly.Signed-off-by Halil Pasic <[email protected]>Fixes 0a01e082a4 ("s390/ipl: sync back loadparm")
Quoted 19 lines
Reported-by Peter Maydell <[email protected]>--- hw/s390x/ipl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/s390x/ipl.c +1
-1@@ -546,7 +546,7 @@ static void update_machine_ipl_properties(IplParameterBlock *iplb)/* Sync loadparm */ if (iplb->flags &DIAG308_FLAGS_LP_VALID ) {uint8_t *ebcdic_loadparm = iplb->loadparm; -char ascii_loadparm[8 ]; +char ascii_loadparm[9 ];int i;for (i =0 ; i <8 && ebcdic_loadparm[i]; i++) {
Quoted 1 line
base-commit:
226cd20706e20264c176f8edbaf17d7c9b7ade4a
Thanks, queued to s390-fixes.
Quoted 32 lines · On Fri, 20 Mar 2020 18:25:18 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 2 lines · On Fri, 20 Mar 2020 15:31:01 +0100 Halil Pasic <[email protected]> wrote:
In
update_machine_ipl_properties()the arrayascii_loadparmneeds to hold the 8 char lodparm and a string terminating zero char.s/lodparm/loadparm/
Quoted 4 lines
Let's increase the size of
ascii_loadparmaccordingly.Signed-off-by Halil Pasic <[email protected]>Fixes 0a01e082a4 ("s390/ipl: sync back loadparm")Fixes Coverity CID 1421966Quoted 17 lines
Reported-by Peter Maydell <[email protected]>--- hw/s390x/ipl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/s390x/ipl.c +1
-1@@ -546,7 +546,7 @@ static void update_machine_ipl_properties(IplParameterBlock *iplb)/* Sync loadparm */ if (iplb->flags &DIAG308_FLAGS_LP_VALID ) {uint8_t *ebcdic_loadparm = iplb->loadparm; -char ascii_loadparm[8 ]; +char ascii_loadparm[9 ];int i;
Quoted 6 lines
Quoted 3 lines
hw/s390x/ipl.c +0
-0for (i =0 ; i <8 && ebcdic_loadparm[i]; i++) {base-commit:
226cd20706e20264c176f8edbaf17d7c9b7ade4aThanks, queued to s390-fixes.
Thank you!
Quoted 26 lines · Halil Pasic
In
update_machine_ipl_properties()the arrayascii_loadparmneeds to hold the 8 char lodparm and a string terminating zero char.Let's increase the size of
ascii_loadparmaccordingly.Signed-off-by Halil Pasic <[email protected]>Fixes 0a01e082a4 ("s390/ipl: sync back loadparm")Reported-by Peter Maydell <[email protected]>--- hw/s390x/ipl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/s390x/ipl.c +1
-1@@ -546,7 +546,7 @@ static void update_machine_ipl_properties(IplParameterBlock *iplb)/* Sync loadparm */ if (iplb->flags &DIAG308_FLAGS_LP_VALID ) {uint8_t *ebcdic_loadparm = iplb->loadparm; -char ascii_loadparm[8 ]; +char ascii_loadparm[9 ];int i;for (i =0 ; i <8 && ebcdic_loadparm[i]; i++) {
Quoted 2 lines
base-commit:
226cd20706e20264c176f8edbaf17d7c9b7ade4a
Signature · 3 lines
Thanks, David / dhildenb