Blame SOURCES/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch

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