* [PATCH 1/1] fs/squashfs: simplify sqfs_read()
@ 2022-04-11 20:54 Heinrich Schuchardt
2022-04-12 6:59 ` Miquel Raynal
2022-04-20 13:12 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2022-04-11 20:54 UTC (permalink / raw)
To: Joao Marcos Costa
Cc: Thomas Petazzoni, Miquel Raynal, u-boot, Heinrich Schuchardt
* Don't check argument of free(). Free does this itself.
* Reduce scope of data_buffer. Remove duplicate free().
* Avoid superfluous NULL assignment.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
fs/squashfs/sqfs.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c
index 5d9c52af80..b07c41e911 100644
--- a/fs/squashfs/sqfs.c
+++ b/fs/squashfs/sqfs.c
@@ -1310,7 +1310,7 @@ static int sqfs_get_lregfile_info(struct squashfs_lreg_inode *lreg,
int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
loff_t *actread)
{
- char *dir = NULL, *fragment_block, *datablock = NULL, *data_buffer = NULL;
+ char *dir = NULL, *fragment_block, *datablock = NULL;
char *fragment = NULL, *file = NULL, *resolved, *data;
u64 start, n_blks, table_size, data_offset, table_offset, sparse_size;
int ret, j, i_number, datablk_count = 0;
@@ -1440,6 +1440,8 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
}
for (j = 0; j < datablk_count; j++) {
+ char *data_buffer;
+
start = data_offset / ctxt.cur_dev->blksz;
table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
table_offset = data_offset - (start * ctxt.cur_dev->blksz);
@@ -1501,9 +1503,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
}
data_offset += table_size;
- if (data_buffer)
- free(data_buffer);
- data_buffer = NULL;
+ free(data_buffer);
if (*actread >= len)
break;
}
@@ -1563,10 +1563,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
out:
free(fragment);
- if (datablk_count) {
- free(data_buffer);
- free(datablock);
- }
+ free(datablock);
free(file);
free(dir);
free(finfo.blk_sizes);
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] fs/squashfs: simplify sqfs_read()
2022-04-11 20:54 [PATCH 1/1] fs/squashfs: simplify sqfs_read() Heinrich Schuchardt
@ 2022-04-12 6:59 ` Miquel Raynal
2022-04-20 13:12 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2022-04-12 6:59 UTC (permalink / raw)
To: Heinrich Schuchardt; +Cc: Joao Marcos Costa, Thomas Petazzoni, u-boot
Hi Heinrich,
heinrich.schuchardt@canonical.com wrote on Mon, 11 Apr 2022 22:54:44
+0200:
> * Don't check argument of free(). Free does this itself.
> * Reduce scope of data_buffer. Remove duplicate free().
> * Avoid superfluous NULL assignment.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
> fs/squashfs/sqfs.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c
> index 5d9c52af80..b07c41e911 100644
> --- a/fs/squashfs/sqfs.c
> +++ b/fs/squashfs/sqfs.c
> @@ -1310,7 +1310,7 @@ static int sqfs_get_lregfile_info(struct squashfs_lreg_inode *lreg,
> int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
> loff_t *actread)
> {
> - char *dir = NULL, *fragment_block, *datablock = NULL, *data_buffer = NULL;
> + char *dir = NULL, *fragment_block, *datablock = NULL;
> char *fragment = NULL, *file = NULL, *resolved, *data;
> u64 start, n_blks, table_size, data_offset, table_offset, sparse_size;
> int ret, j, i_number, datablk_count = 0;
> @@ -1440,6 +1440,8 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
> }
>
> for (j = 0; j < datablk_count; j++) {
> + char *data_buffer;
> +
> start = data_offset / ctxt.cur_dev->blksz;
> table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
> table_offset = data_offset - (start * ctxt.cur_dev->blksz);
> @@ -1501,9 +1503,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
> }
>
> data_offset += table_size;
> - if (data_buffer)
> - free(data_buffer);
> - data_buffer = NULL;
> + free(data_buffer);
> if (*actread >= len)
> break;
> }
> @@ -1563,10 +1563,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
>
> out:
> free(fragment);
> - if (datablk_count) {
> - free(data_buffer);
> - free(datablock);
> - }
> + free(datablock);
> free(file);
> free(dir);
> free(finfo.blk_sizes);
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] fs/squashfs: simplify sqfs_read()
2022-04-11 20:54 [PATCH 1/1] fs/squashfs: simplify sqfs_read() Heinrich Schuchardt
2022-04-12 6:59 ` Miquel Raynal
@ 2022-04-20 13:12 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2022-04-20 13:12 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Joao Marcos Costa, Thomas Petazzoni, Miquel Raynal, u-boot
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
On Mon, Apr 11, 2022 at 10:54:44PM +0200, Heinrich Schuchardt wrote:
> * Don't check argument of free(). Free does this itself.
> * Reduce scope of data_buffer. Remove duplicate free().
> * Avoid superfluous NULL assignment.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-20 13:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 20:54 [PATCH 1/1] fs/squashfs: simplify sqfs_read() Heinrich Schuchardt
2022-04-12 6:59 ` Miquel Raynal
2022-04-20 13:12 ` Tom Rini
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.