From 192bc6948b02ff4168cab16162fffb507946dc2b Mon Sep 17 00:00:00 2001 From: Ben Whitten Date: Wed, 30 Dec 2015 13:05:58 +0000 Subject: Fix GCC format-security errors and convert sprintfs. With format-security errors turned on, GCC picks up the use of sprintf with a format parameter not being a string literal. Simple uses of sprintf are also converted to use strcpy. Signed-off-by: Ben Whitten Acked-by: Wolfgang Denk Reviewed-by: Tom Rini --- disk/part_dos.c | 4 ++-- disk/part_efi.c | 2 +- disk/part_iso.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'disk') diff --git a/disk/part_dos.c b/disk/part_dos.c index 1e5cb330cd..08872d6a03 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -237,7 +237,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, break; } /* sprintf(info->type, "%d, pt->sys_ind); */ - sprintf ((char *)info->type, "U-Boot"); + strcpy((char *)info->type, "U-Boot"); info->bootable = is_bootable(pt); #ifdef CONFIG_PARTITION_UUIDS sprintf(info->uuid, "%08x-%02x", disksig, part_num); @@ -273,7 +273,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, info->size = dev_desc->lba; info->blksz = DOS_PART_DEFAULT_SECTOR; info->bootable = 0; - sprintf ((char *)info->type, "U-Boot"); + strcpy((char *)info->type, "U-Boot"); #ifdef CONFIG_PARTITION_UUIDS info->uuid[0] = 0; #endif diff --git a/disk/part_efi.c b/disk/part_efi.c index 22dfbb16b5..e1b58c54b4 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -281,7 +281,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part, sprintf((char *)info->name, "%s", print_efiname(&gpt_pte[part - 1])); - sprintf((char *)info->type, "U-Boot"); + strcpy((char *)info->type, "U-Boot"); info->bootable = is_bootable(&gpt_pte[part - 1]); #ifdef CONFIG_PARTITION_UUIDS uuid_bin_to_str(gpt_pte[part - 1].unique_partition_guid.b, info->uuid, diff --git a/disk/part_iso.c b/disk/part_iso.c index 0b1ac60637..5f4bb182dd 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -137,7 +137,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_ /* the validation entry seems to be ok, now search the "partition" */ entry_num=0; offset=0x20; - sprintf ((char *)info->type, "U-Boot"); + strcpy((char *)info->type, "U-Boot"); switch(dev_desc->if_type) { case IF_TYPE_IDE: case IF_TYPE_SATA: -- cgit