aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@posteo.net>2020-11-24 18:07:52 +0100
committerTom Rini <trini@konsulko.com>2020-12-02 16:21:58 -0500
commit7e932ac790b3615a67a3c24041c194aa748c0d98 (patch)
treeb19f4be0f32a13d02338a078a1c70e6004248e1c /fs
parentab31883ae7e54ded8396b13a9057f861bf916ea4 (diff)
downloadu-boot-7e932ac790b3615a67a3c24041c194aa748c0d98.zip
u-boot-7e932ac790b3615a67a3c24041c194aa748c0d98.tar.gz
u-boot-7e932ac790b3615a67a3c24041c194aa748c0d98.tar.bz2
fs/squashfs: sqfs_close/sqfs_read_sblk: set ctxt.sblk to NULL after free
This will prevent a double free error if sqfs_close() is called twice. Signed-off-by: Richard Genoud <richard.genoud@posteo.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/squashfs/sqfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c
index 608a2bb..5de69ac 100644
--- a/fs/squashfs/sqfs.c
+++ b/fs/squashfs/sqfs.c
@@ -49,6 +49,7 @@ static int sqfs_read_sblk(struct squashfs_super_block **sblk)
if (sqfs_disk_read(0, 1, *sblk) != 1) {
free(*sblk);
+ sblk = NULL;
return -EINVAL;
}
@@ -1689,9 +1690,10 @@ free_strings:
void sqfs_close(void)
{
+ sqfs_decompressor_cleanup(&ctxt);
free(ctxt.sblk);
+ ctxt.sblk = NULL;
ctxt.cur_dev = NULL;
- sqfs_decompressor_cleanup(&ctxt);
}
void sqfs_closedir(struct fs_dir_stream *dirs)