From 7e932ac790b3615a67a3c24041c194aa748c0d98 Mon Sep 17 00:00:00 2001 From: Richard Genoud Date: Tue, 24 Nov 2020 18:07:52 +0100 Subject: [PATCH] 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 --- fs/squashfs/sqfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 608a2bb454..5de69ac3ca 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) { - free(ctxt.sblk); - ctxt.cur_dev = NULL; sqfs_decompressor_cleanup(&ctxt); + free(ctxt.sblk); + ctxt.sblk = NULL; + ctxt.cur_dev = NULL; } void sqfs_closedir(struct fs_dir_stream *dirs)