Skip to contentSkip to conversation

Fix the length in the stsi check for the VM name

PATCH In review Thomas Huth 4 participants 4 messages Feb 9, 2021 – Feb 10, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix the length in the stsi check for the VM name

sizeof(somepointer) results in the size of the pointer, i.e. 8 on a 64-bit system, so the

memcmp(data->ext_names[0], vm_name_ext, sizeof(vm_name_ext))

only compared the first 8 characters of the VM name here. Switch to a proper array to get the sizeof() right.

---
 s390x/stsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/stsi.c +1 -1
index 4109b8d..87d4804 100644
@@ -106,7 +106,7 @@ static void test_3_2_2(void)
 				 0x00, 0x03 };
 	/* EBCDIC for "KVM/" */
 	const uint8_t cpi_kvm[] = { 0xd2, 0xe5, 0xd4, 0x61 };
-	const char *vm_name_ext = "kvm-unit-test";
+	const char vm_name_ext[] = "kvm-unit-test";
 	struct stsi_322 *data = (void *)pagebuf;
 
 	report_prefix_push("3.2.2");
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Thomas Huth

sizeof(somepointer) results in the size of the pointer, i.e. 8 on a 64-bit system, so the

memcmp(data->ext_names[0], vm_name_ext, sizeof(vm_name_ext))

only compared the first 8 characters of the VM name here. Switch to a proper array to get the sizeof() right.

---
  s390x/stsi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
s390x/stsi.c +0 -0
index 4109b8d..87d4804 100644

s390x/stsi.c static void test_3_2_2(void) · line 112

Quoted 8 lines
s390x/stsi.c +1 -1
@@ -106,7 +106,7 @@ static void test_3_2_2(void)
  				 0x00, 0x03 };
  	/* EBCDIC for "KVM/" */
  	const uint8_t cpi_kvm[] = { 0xd2, 0xe5, 0xd4, 0x61 };
-	const char *vm_name_ext = "kvm-unit-test";
+	const char vm_name_ext[] = "kvm-unit-test";
  	struct stsi_322 *data = (void *)pagebuf;
 
  	report_prefix_push("3.2.2");
Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
Quoted 7 lines · Thomas Huth

sizeof(somepointer) results in the size of the pointer, i.e. 8 on a 64-bit system, so the

memcmp(data->ext_names[0], vm_name_ext, sizeof(vm_name_ext))

only compared the first 8 characters of the VM name here. Switch to a proper array to get the sizeof() right.

Quoted 20 lines
---
 s390x/stsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/stsi.c +1 -1
index 4109b8d..87d4804 100644
@@ -106,7 +106,7 @@ static void test_3_2_2(void)
 				 0x00, 0x03 };
 	/* EBCDIC for "KVM/" */
 	const uint8_t cpi_kvm[] = { 0xd2, 0xe5, 0xd4, 0x61 };
-	const char *vm_name_ext = "kvm-unit-test";
+	const char vm_name_ext[] = "kvm-unit-test";
 	struct stsi_322 *data = (void *)pagebuf;
 
 	report_prefix_push("3.2.2");
Reviewed-by on v1 1/1
#3 lore raw
In reply to Thomas Huth
Quoted 5 lines · On Tue, 9 Feb 2021 16:57:05 +0100 Thomas Huth <[email protected]> wrote:

sizeof(somepointer) results in the size of the pointer, i.e. 8 on a 64-bit system, so the

memcmp(data->ext_names[0], vm_name_ext, sizeof(vm_name_ext))

Quoted 7 lines

only compared the first 8 characters of the VM name here. Switch to a proper array to get the sizeof() right.

---
 s390x/stsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)