openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

acpi: use constants as strncpy limit 

gcc is not smart enough to figure out length was validated before use as
strncpy limit, resulting in this warning:

inlined from ‘virt_set_oem_table_id’ at ../../hw/arm/virt.c:2197:5:
/usr/include/aarch64-linux-gnu/bits/string_fortified.h:106:10: error:
‘__builtin_strncpy’ specified bound depends on the length of the
source argument [-Werror=stringop-overflow=]

Simplify things by using a constant limit instead.

Fixes: 97fc5d507fca ("acpi: Permit OEM ID and OEM table ID fields to be changed")
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2021-02-02 17:52:53 -05:00
parent 602b458201
commit 43e229a52b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/virt.c
View File

@ -2173,7 +2173,7 @@ static void virt_set_oem_id(Object *obj, const char *value, Error **errp)
return;
}
strncpy(vms->oem_id, value, len + 1);
strncpy(vms->oem_id, value, 6);
}
static char *virt_get_oem_table_id(Object *obj, Error **errp)
@ -2194,7 +2194,7 @@ static void virt_set_oem_table_id(Object *obj, const char *value,
"User specified oem-table-id value is bigger than 8 bytes in size");
return;
}
strncpy(vms->oem_table_id, value, len + 1);
strncpy(vms->oem_table_id, value, 8);
}

4
hw/i386/microvm.c
View File

@ -668,7 +668,7 @@ static void microvm_machine_set_oem_id(Object *obj, const char *value,
return;
}
strncpy(mms->oem_id, value, len + 1);
strncpy(mms->oem_id, value, 6);
}
static char *microvm_machine_get_oem_table_id(Object *obj, Error **errp)
@ -690,7 +690,7 @@ static void microvm_machine_set_oem_table_id(Object *obj, const char *value,
"8 bytes in size");
return;
}
strncpy(mms->oem_table_id, value, len + 1);
strncpy(mms->oem_table_id, value, 8);
}
static void microvm_machine_initfn(Object *obj)

4
hw/i386/pc.c
View File

@ -1630,7 +1630,7 @@ static void pc_machine_set_oem_id(Object *obj, const char *value, Error **errp)
return;
}
strncpy(pcms->oem_id, value, len + 1);
strncpy(pcms->oem_id, value, 6);
}
static char *pc_machine_get_oem_table_id(Object *obj, Error **errp)
@ -1652,7 +1652,7 @@ static void pc_machine_set_oem_table_id(Object *obj, const char *value,
"8 bytes in size");
return;
}
strncpy(pcms->oem_table_id, value, len + 1);
strncpy(pcms->oem_table_id, value, 8);
}
static void pc_machine_initfn(Object *obj)