memcpy() in lib/fdt.c

memcpy() in lib/fdt.c

[Leif Lindholm]

Hi,

There is a typo in fdt.c, invoking memcpy() rather than grub_memcpy().
Suggested trivial fix:

diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
index 9c886fc..9f34dc7 100644
--- a/grub-core/lib/fdt.c
+++ b/grub-core/lib/fdt.c
@@ -219,8 +219,8 @@ static int rearrange_blocks (void *fdt, unsigned int clearan
   grub_fdt_set_off_dt_strings (fdt, off_dt_strings);
 
   /* Copy reordered blocks back to fdt. */
-  memcpy (fdt_ptr + off_mem_rsvmap, tmp_fdt + off_mem_rsvmap,
-         grub_fdt_get_totalsize (fdt) - off_mem_rsvmap);
+  grub_memcpy (fdt_ptr + off_mem_rsvmap, tmp_fdt + off_mem_rsvmap,
+               grub_fdt_get_totalsize (fdt) - off_mem_rsvmap);
 
   grub_free(tmp_fdt);
   return 0;

Re: memcpy() in lib/fdt.c

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

Go ahead
On 10.12.2013 16:38, Leif Lindholm wrote:
> Hi,
> 
> There is a typo in fdt.c, invoking memcpy() rather than grub_memcpy().
> Suggested trivial fix:
> 
> diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
> index 9c886fc..9f34dc7 100644
> --- a/grub-core/lib/fdt.c
> +++ b/grub-core/lib/fdt.c
> @@ -219,8 +219,8 @@ static int rearrange_blocks (void *fdt, unsigned int clearan
>    grub_fdt_set_off_dt_strings (fdt, off_dt_strings);
>  
>    /* Copy reordered blocks back to fdt. */
> -  memcpy (fdt_ptr + off_mem_rsvmap, tmp_fdt + off_mem_rsvmap,
> -         grub_fdt_get_totalsize (fdt) - off_mem_rsvmap);
> +  grub_memcpy (fdt_ptr + off_mem_rsvmap, tmp_fdt + off_mem_rsvmap,
> +               grub_fdt_get_totalsize (fdt) - off_mem_rsvmap);
>  
>    grub_free(tmp_fdt);
>    return 0;
> 
> 
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 291 bytes --]