U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lukasz Majewski <l.majewski@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2] part_efi: fix protective mbr struct allocation
Date: Thu, 13 Feb 2014 14:06:15 +0100	[thread overview]
Message-ID: <20140213140615.0918a8ee@amdc2363> (raw)
In-Reply-To: <1392281304-19830-1-git-send-email-hector.palacios@digi.com>

Hi Hector,

> The calloc() call was allocating space for the sizeof the struct
> pointer rather than for the struct contents.
> Besides, since this buffer is passed to mmc for writing and some
> platforms may use cache, the legacy_mbr struct should be
> cache-aligned.

Thanks for preparing v2.
Everything seems OK.

Test HW: Exynos4210 - Trats.

Tested-by: Lukasz Majewski <l.majewski@samsung.com>

> 
> Signed-off-by: Hector Palacios <hector.palacios@digi.com>
> ---
> 
> Notes:
>     Changes since V1:
>             - Cache-align declaration of p_mbr pointer
>             - Use *p_mbr in sizeof() to match kernel CodingStyle
> 
>  disk/part_efi.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/disk/part_efi.c b/disk/part_efi.c
> index 5dfaf490c89a..42936e04fb67 100644
> --- a/disk/part_efi.c
> +++ b/disk/part_efi.c
> @@ -229,10 +229,10 @@ int test_part_efi(block_dev_desc_t * dev_desc)
>   */
>  static int set_protective_mbr(block_dev_desc_t *dev_desc)
>  {
> -	legacy_mbr *p_mbr;
> -
>  	/* Setup the Protective MBR */
> -	p_mbr = calloc(1, sizeof(p_mbr));
> +	ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, p_mbr, 1);
> +	memset(p_mbr, 0, sizeof(*p_mbr));
> +
>  	if (p_mbr == NULL) {
>  		printf("%s: calloc failed!\n", __func__);
>  		return -1;
> @@ -247,11 +247,9 @@ static int set_protective_mbr(block_dev_desc_t
> *dev_desc) if (dev_desc->block_write(dev_desc->dev, 0, 1, p_mbr) !=
> 1) { printf("** Can't write to device %d **\n",
>  			dev_desc->dev);
> -		free(p_mbr);
>  		return -1;
>  	}
>  
> -	free(p_mbr);
>  	return 0;
>  }
>  

-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

  reply	other threads:[~2014-02-13 13:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-13  8:48 [U-Boot] [PATCH v2] part_efi: fix protective mbr struct allocation Hector Palacios
2014-02-13 13:06 ` Lukasz Majewski [this message]
2014-02-24 15:46 ` Lukasz Majewski
2014-02-24 15:52   ` Tom Rini
2014-02-25 13:57 ` [U-Boot] [U-Boot, " Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140213140615.0918a8ee@amdc2363 \
    --to=l.majewski@samsung.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox