[PATCH] ubifs: correct the size of nnode in memset

Brian Norris computersforpeace at gmail.com
Wed Aug 19 09:29:47 PDT 2015


On Wed, Aug 19, 2015 at 04:28:52PM +0800, Dongsheng Yang wrote:
> There is a typo in lpt to memset nnode by the
> size in sizeof(stuct ubifs_pnode).
> 
> Signed-off-by: Dongsheng Yang <yangds.fnst at cn.fujitsu.com>

Pushed to mtd-utils.git, as it's obvious. Good catch!

I'll take a look at your restructuring patches eventually. But I'll
usually just defer UBIFS stuff to Richard/Artem/others.

> ---
>  mkfs.ubifs/lpt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/mkfs.ubifs/lpt.c b/mkfs.ubifs/lpt.c
> index f6d4352..6aa0b88 100644
> --- a/mkfs.ubifs/lpt.c
> +++ b/mkfs.ubifs/lpt.c
> @@ -384,7 +384,7 @@ int create_lpt(struct ubifs_info *c)
>  		goto out;
>  	}
>  	memset(pnode, 0 , sizeof(struct ubifs_pnode));
> -	memset(nnode, 0 , sizeof(struct ubifs_pnode));
> +	memset(nnode, 0 , sizeof(struct ubifs_nnode));

FWIW, struct ubifs_pnode and struct ubifs_nnode look like they would be
the same size when using 32-bit pointers, but a bit different (see the
third field in structs ubifs_nbranch and ubifs_lprops) with 64-bit.

>  
>  	c->lscan_lnum = c->main_first;
>  
> -- 
> 1.8.4.2

Brian



More information about the linux-mtd mailing list