vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace few instances of memcmp/memcpy in the code that should be grub_memcmp/grub_memcpy.

Browse source
This commit is contained in:
Vladimir Serbinenko 2014-04-04 07:58:42 +02:00
parent 9706066791
commit 8063ce197f
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-04-04 Vladimir Serbinenko <phcoder@gmail.com>
Replace few instances of memcmp/memcpy in the code that should be
grub_memcmp/grub_memcpy.
2014-04-03 Vladimir Serbinenko <phcoder@gmail.com> 2014-04-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe

4
grub-core/commands/acpihalt.c
View file

@ -214,8 +214,8 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end,
} }
case GRUB_ACPI_OPCODE_NAME: case GRUB_ACPI_OPCODE_NAME:
ptr++; ptr++;
if ((!scope || memcmp (scope, "\\", scope_len) == 0) && if ((!scope || grub_memcmp (scope, "\\", scope_len) == 0) &&
(memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0)) (grub_memcmp (ptr, "_S5_", 4) == 0 || grub_memcmp (ptr, "\\_S5_", 4) == 0))
{ {
int ll; int ll;
grub_uint8_t *ptr2 = ptr; grub_uint8_t *ptr2 = ptr;

4
grub-core/commands/legacycfg.c
View file

@ -580,7 +580,7 @@ check_password_md5_real (const char *entered,
GRUB_MD_MD5->write (ctx, entered, enteredlen); GRUB_MD_MD5->write (ctx, entered, enteredlen);
digest = GRUB_MD_MD5->read (ctx); digest = GRUB_MD_MD5->read (ctx);
GRUB_MD_MD5->final (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->init (ctx);
GRUB_MD_MD5->write (ctx, entered, enteredlen); GRUB_MD_MD5->write (ctx, entered, enteredlen);
@ -596,7 +596,7 @@ check_password_md5_real (const char *entered,
for (i = 0; i < 1000; i++) for (i = 0; i < 1000; i++)
{ {
memcpy (alt_result, digest, 16); grub_memcpy (alt_result, digest, 16);
GRUB_MD_MD5->init (ctx); GRUB_MD_MD5->init (ctx);
if ((i & 1) != 0) if ((i & 1) != 0)

2
grub-core/lib/relocator.c
View file

@ -652,7 +652,7 @@ malloc_in_range (struct grub_relocator *rel,
for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS); for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
i++) 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++) for (j = 0; j < N; j++)
counter[((events[j].pos >> (DIGITSORT_BITS * i)) counter[((events[j].pos >> (DIGITSORT_BITS * i))
& DIGITSORT_MASK) + 1]++; & DIGITSORT_MASK) + 1]++;

4
grub-core/loader/i386/bsd.c
View file

@ -1082,7 +1082,7 @@ grub_netbsd_add_boot_disk_and_wedge (void)
grub_crypto_hash (GRUB_MD_MD5, hash, grub_crypto_hash (GRUB_MD_MD5, hash,
buf.raw, GRUB_DISK_SECTOR_SIZE); 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)); 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.labelsector = partmapsector;
bid.label.type = buf.label.type; bid.label.type = buf.label.type;
bid.label.checksum = buf.label.checksum; bid.label.checksum = buf.label.checksum;
memcpy (bid.label.packname, buf.label.packname, 16); grub_memcpy (bid.label.packname, buf.label.packname, 16);
} }
else else
{ {