Skip to content

Commit f77c6b5

Browse files
committed
CMD Line: Fix version string copying
Use strncpy to avoid scenarios where ABOOT_VERSION is greater than expected size. Signed-off-by: Vishal Mahaveer <[email protected]>
1 parent 33af7cb commit f77c6b5

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

booti.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ static void boot_settings(struct bootloader_ops *boot_ops, boot_img_hdr *hdr,
118118
char aboot_version_string[64];
119119
char boot_str[64];
120120
char temp_cmdline[512] = EXTENDED_CMDLINE;
121+
int aboot_version_length = strlen(aboot_version_string);
121122

122123
serial_len = sprintf(serial_str, " androidboot.serialno=%s",
123124
boot_ops->proc_ops->proc_get_serial_num());
@@ -127,7 +128,9 @@ static void boot_settings(struct bootloader_ops *boot_ops, boot_img_hdr *hdr,
127128
strlen((const char *)hdr->cmdline) + 1))
128129
strcat((char *)hdr->cmdline, serial_str);
129130

130-
strcpy(aboot_version_string, ABOOT_VERSION);
131+
strncpy(aboot_version_string, ABOOT_VERSION, aboot_version_length);
132+
aboot_version_string[aboot_version_length - 1] = '\0';
133+
131134
boot_len = sprintf(boot_str, " androidboot.bootloader=%s",
132135
aboot_version_string);
133136

0 commit comments

Comments
 (0)