From: Marek Behun <marek.behun@nic.cz>
To: Qu Wenruo <wqu@suse.com>
Cc: u-boot@lists.denx.de, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH U-BOOT v2 1/3] fs: btrfs: Use LZO_LEN to replace immediate number
Date: Thu, 26 Mar 2020 10:02:45 +0100 [thread overview]
Message-ID: <20200326100245.730679aa@nic.cz> (raw)
In-Reply-To: <20200326053556.20492-2-wqu@suse.com>
On Thu, 26 Mar 2020 13:35:54 +0800
Qu Wenruo <wqu@suse.com> wrote:
> Just a cleanup. These immediate numbers make my eyes hurt.
>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> Cc: Marek Behun <marek.behun@nic.cz>
> ---
> fs/btrfs/compression.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index 346875d45a1b..4ef44ce11485 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -12,36 +12,38 @@
> #include <u-boot/zlib.h>
> #include <asm/unaligned.h>
>
> +/* Header for each segment, LE32, recording the compressed size */
> +#define LZO_LEN 4
> static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen)
> {
> u32 tot_len, in_len, res;
> size_t out_len;
> int ret;
>
> - if (clen < 4)
> + if (clen < LZO_LEN)
> return -1;
>
> tot_len = le32_to_cpu(get_unaligned((u32 *)cbuf));
> - cbuf += 4;
> - clen -= 4;
> - tot_len -= 4;
> + cbuf += LZO_LEN;
> + clen -= LZO_LEN;
> + tot_len -= LZO_LEN;
>
> if (tot_len == 0 && dlen)
> return -1;
> - if (tot_len < 4)
> + if (tot_len < LZO_LEN)
> return -1;
>
> res = 0;
>
> - while (tot_len > 4) {
> + while (tot_len > LZO_LEN) {
> in_len = le32_to_cpu(get_unaligned((u32 *)cbuf));
> - cbuf += 4;
> - clen -= 4;
> + cbuf += LZO_LEN;
> + clen -= LZO_LEN;
>
> - if (in_len > clen || tot_len < 4 + in_len)
> + if (in_len > clen || tot_len < LZO_LEN + in_len)
> return -1;
>
> - tot_len -= 4 + in_len;
> + tot_len -= (LZO_LEN + in_len);
>
> out_len = dlen;
> ret = lzo1x_decompress_safe(cbuf, in_len, dbuf, &out_len);
Reviewed-by: Marek Behún <marek.behun@nic.cz>
WARNING: multiple messages have this Message-ID (diff)
From: Marek Behun <marek.behun@nic.cz>
To: u-boot@lists.denx.de
Subject: [PATCH U-BOOT v2 1/3] fs: btrfs: Use LZO_LEN to replace immediate number
Date: Thu, 26 Mar 2020 10:02:45 +0100 [thread overview]
Message-ID: <20200326100245.730679aa@nic.cz> (raw)
In-Reply-To: <20200326053556.20492-2-wqu@suse.com>
On Thu, 26 Mar 2020 13:35:54 +0800
Qu Wenruo <wqu@suse.com> wrote:
> Just a cleanup. These immediate numbers make my eyes hurt.
>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> Cc: Marek Behun <marek.behun@nic.cz>
> ---
> fs/btrfs/compression.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index 346875d45a1b..4ef44ce11485 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -12,36 +12,38 @@
> #include <u-boot/zlib.h>
> #include <asm/unaligned.h>
>
> +/* Header for each segment, LE32, recording the compressed size */
> +#define LZO_LEN 4
> static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen)
> {
> u32 tot_len, in_len, res;
> size_t out_len;
> int ret;
>
> - if (clen < 4)
> + if (clen < LZO_LEN)
> return -1;
>
> tot_len = le32_to_cpu(get_unaligned((u32 *)cbuf));
> - cbuf += 4;
> - clen -= 4;
> - tot_len -= 4;
> + cbuf += LZO_LEN;
> + clen -= LZO_LEN;
> + tot_len -= LZO_LEN;
>
> if (tot_len == 0 && dlen)
> return -1;
> - if (tot_len < 4)
> + if (tot_len < LZO_LEN)
> return -1;
>
> res = 0;
>
> - while (tot_len > 4) {
> + while (tot_len > LZO_LEN) {
> in_len = le32_to_cpu(get_unaligned((u32 *)cbuf));
> - cbuf += 4;
> - clen -= 4;
> + cbuf += LZO_LEN;
> + clen -= LZO_LEN;
>
> - if (in_len > clen || tot_len < 4 + in_len)
> + if (in_len > clen || tot_len < LZO_LEN + in_len)
> return -1;
>
> - tot_len -= 4 + in_len;
> + tot_len -= (LZO_LEN + in_len);
>
> out_len = dlen;
> ret = lzo1x_decompress_safe(cbuf, in_len, dbuf, &out_len);
Reviewed-by: Marek Beh?n <marek.behun@nic.cz>
next prev parent reply other threads:[~2020-03-26 9:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 5:35 [PATCH U-BOOT v2 0/3] fs: btrfs: Fix false LZO decompression error due to missing page boundary check Qu Wenruo
2020-03-26 5:35 ` Qu Wenruo
2020-03-26 5:35 ` [PATCH U-BOOT v2 1/3] fs: btrfs: Use LZO_LEN to replace immediate number Qu Wenruo
2020-03-26 5:35 ` Qu Wenruo
2020-03-26 9:02 ` Marek Behun [this message]
2020-03-26 9:02 ` Marek Behun
2020-04-17 21:08 ` Tom Rini
2020-04-17 21:08 ` Tom Rini
2020-03-26 5:35 ` [PATCH U-BOOT v2 2/3] fs: btrfs: Reject fs with sector size other than PAGE_SIZE Qu Wenruo
2020-03-26 5:35 ` Qu Wenruo
2020-03-26 9:03 ` Marek Behun
2020-03-26 9:03 ` Marek Behun
2020-04-17 21:09 ` Tom Rini
2020-04-17 21:09 ` Tom Rini
2020-03-26 5:35 ` [PATCH U-BOOT v2 3/3] fs: btrfs: Fix LZO false decompression error caused by pending zero Qu Wenruo
2020-03-26 5:35 ` Qu Wenruo
2020-03-26 9:03 ` Marek Behun
2020-03-26 9:03 ` Marek Behun
2020-04-17 21:09 ` Tom Rini
2020-04-17 21:09 ` 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=20200326100245.730679aa@nic.cz \
--to=marek.behun@nic.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=u-boot@lists.denx.de \
--cc=wqu@suse.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.