From cb2cfc87fad111a539e9645f6a96d0a89a28c8ab Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 4 Apr 2014 07:58:42 +0200 Subject: [PATCH 073/143] Replace few instances of memcmp/memcpy in the code that should be grub_memcmp/grub_memcpy. --- ChangeLog | 5 +++++ grub-core/commands/acpihalt.c | 4 ++-- grub-core/commands/legacycfg.c | 4 ++-- grub-core/lib/relocator.c | 2 +- grub-core/loader/i386/bsd.c | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a48409..f18cdba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-04 Vladimir Serbinenko + + Replace few instances of memcmp/memcpy in the code that should be + grub_memcmp/grub_memcpy. + 2014-04-03 Vladimir Serbinenko * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c index 09421a6..83bdfe1 100644 --- a/grub-core/commands/acpihalt.c +++ b/grub-core/commands/acpihalt.c @@ -214,8 +214,8 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end, } case GRUB_ACPI_OPCODE_NAME: ptr++; - if ((!scope || memcmp (scope, "\\", scope_len) == 0) && - (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0)) + if ((!scope || grub_memcmp (scope, "\\", scope_len) == 0) && + (grub_memcmp (ptr, "_S5_", 4) == 0 || grub_memcmp (ptr, "\\_S5_", 4) == 0)) { int ll; grub_uint8_t *ptr2 = ptr; diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c index e42a9d8..2c09fb7 100644 --- a/grub-core/commands/legacycfg.c +++ b/grub-core/commands/legacycfg.c @@ -580,7 +580,7 @@ check_password_md5_real (const char *entered, GRUB_MD_MD5->write (ctx, entered, enteredlen); digest = GRUB_MD_MD5->read (ctx); GRUB_MD_MD5->final (ctx); - memcpy (alt_result, digest, MD5_HASHLEN); + grub_memcpy (alt_result, digest, MD5_HASHLEN); GRUB_MD_MD5->init (ctx); GRUB_MD_MD5->write (ctx, entered, enteredlen); @@ -596,7 +596,7 @@ check_password_md5_real (const char *entered, for (i = 0; i < 1000; i++) { - memcpy (alt_result, digest, 16); + grub_memcpy (alt_result, digest, 16); GRUB_MD_MD5->init (ctx); if ((i & 1) != 0) diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c index cb11ea5..f759c7f 100644 --- a/grub-core/lib/relocator.c +++ b/grub-core/lib/relocator.c @@ -652,7 +652,7 @@ malloc_in_range (struct grub_relocator *rel, for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS); i++) { - memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0])); + grub_memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0])); for (j = 0; j < N; j++) counter[((events[j].pos >> (DIGITSORT_BITS * i)) & DIGITSORT_MASK) + 1]++; diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c index 19985f0..41ef910 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -1082,7 +1082,7 @@ grub_netbsd_add_boot_disk_and_wedge (void) grub_crypto_hash (GRUB_MD_MD5, hash, buf.raw, GRUB_DISK_SECTOR_SIZE); - memcpy (biw.matchhash, hash, 16); + grub_memcpy (biw.matchhash, hash, 16); grub_bsd_add_meta (NETBSD_BTINFO_BOOTWEDGE, &biw, sizeof (biw)); } @@ -1100,7 +1100,7 @@ grub_netbsd_add_boot_disk_and_wedge (void) bid.labelsector = partmapsector; bid.label.type = buf.label.type; bid.label.checksum = buf.label.checksum; - memcpy (bid.label.packname, buf.label.packname, 16); + grub_memcpy (bid.label.packname, buf.label.packname, 16); } else { -- 1.9.3