linux-kernel - Re: [PATCH v2 2/2] ubifs: Simplify the code using ubifs_crc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <b0c99eb4-ff3d-cfa9-5f4d-92d138e688a7@huawei.com>
Date: Tue, 12 Aug 2025 11:06:33 +0800
From: Zhihao Cheng <chengzhihao1@...wei.com>
To: Xichao Zhao <zhao.xichao@...o.com>, Richard Weinberger <richard@....at>,
	"open list:UBI FILE SYSTEM (UBIFS)" <linux-mtd@...ts.infradead.org>, open
 list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 2/2] ubifs: Simplify the code using ubifs_crc_node

在 2025/8/12 10:10, Xichao Zhao 写道:
> Replace part of the code using ubifs_crc_node.
> 
> Signed-off-by: Xichao Zhao <zhao.xichao@...o.com>
> ---
>   fs/ubifs/io.c       | 9 ++-------
>   fs/ubifs/recovery.c | 4 +---
>   2 files changed, 3 insertions(+), 10 deletions(-)
> 

Reviewed-by: Zhihao Cheng <chengzhihao1@...wei.com>
> diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
> index e0dfe6827d65..6c6d68242779 100644
> --- a/fs/ubifs/io.c
> +++ b/fs/ubifs/io.c
> @@ -327,8 +327,6 @@ int ubifs_check_node(const struct ubifs_info *c, const void *buf, int len,
>    */
>   void ubifs_pad(const struct ubifs_info *c, void *buf, int pad)
>   {
> -	uint32_t crc;
> -
>   	ubifs_assert(c, pad >= 0);
>   
>   	if (pad >= UBIFS_PAD_NODE_SZ) {
> @@ -343,8 +341,7 @@ void ubifs_pad(const struct ubifs_info *c, void *buf, int pad)
>   		ch->len = cpu_to_le32(UBIFS_PAD_NODE_SZ);
>   		pad -= UBIFS_PAD_NODE_SZ;
>   		pad_node->pad_len = cpu_to_le32(pad);
> -		crc = crc32(UBIFS_CRC32_INIT, buf + 8, UBIFS_PAD_NODE_SZ - 8);
> -		ch->crc = cpu_to_le32(crc);
> +		ubifs_crc_node(buf, UBIFS_PAD_NODE_SZ);
>   		memset(buf + UBIFS_PAD_NODE_SZ, 0, pad);
>   	} else if (pad > 0)
>   		/* Too little space, padding node won't fit */
> @@ -469,7 +466,6 @@ void ubifs_prepare_node(struct ubifs_info *c, void *node, int len, int pad)
>    */
>   void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last)
>   {
> -	uint32_t crc;
>   	struct ubifs_ch *ch = node;
>   	unsigned long long sqnum = next_sqnum(c);
>   
> @@ -483,8 +479,7 @@ void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last)
>   		ch->group_type = UBIFS_IN_NODE_GROUP;
>   	ch->sqnum = cpu_to_le64(sqnum);
>   	ch->padding[0] = ch->padding[1] = 0;
> -	crc = crc32(UBIFS_CRC32_INIT, node + 8, len - 8);
> -	ch->crc = cpu_to_le32(crc);
> +	ubifs_crc_node(node, len);
>   }
>   
>   /**
> diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
> index f0d51dd21c9e..b36dc9b032f4 100644
> --- a/fs/ubifs/recovery.c
> +++ b/fs/ubifs/recovery.c
> @@ -1406,7 +1406,6 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e)
>   	union ubifs_key key;
>   	int err, lnum, offs, len;
>   	loff_t i_size;
> -	uint32_t crc;
>   
>   	/* Locate the inode node LEB number and offset */
>   	ino_key_init(c, &key, e->inum);
> @@ -1428,8 +1427,7 @@ static int fix_size_in_place(struct ubifs_info *c, struct size_entry *e)
>   	ino = c->sbuf + offs;
>   	ino->size = cpu_to_le64(e->d_size);
>   	len = le32_to_cpu(ino->ch.len);
> -	crc = crc32(UBIFS_CRC32_INIT, (void *)ino + 8, len - 8);
> -	ino->ch.crc = cpu_to_le32(crc);
> +	ubifs_crc_node((void *)ino, len);
>   	/* Work out where data in the LEB ends and free space begins */
>   	p = c->sbuf;
>   	len = c->leb_size - 1;
>