From 376562458fa457a62863172123b776cb5f7f268c Mon Sep 17 00:00:00 2001 From: Richard Genoud Date: Tue, 3 Nov 2020 12:11:21 +0100 Subject: [PATCH] fs/squashfs: sqfs_probe: reset cur_dev/cur_part_info to NULL on error Resetting the context on error will prevent some checks like: if (!ctx.cur_dev) To pass when the probe method has failed Signed-off-by: Richard Genoud [jh80.chung: cherry picked from mainline commit 56cf1ceee38435a0c105d40336d12d19e1db8b1d] Signed-off-by: Jaehoon Chung Change-Id: I998b1fa2d790bf9618d0d652663edb220a32c610 --- fs/squashfs/sqfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 2e63039..6fcc5de 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -1088,7 +1088,7 @@ int sqfs_probe(struct blk_desc *fs_dev_desc, struct disk_partition *fs_partition ret = sqfs_read_sblk(&sblk); if (ret) - return ret; + goto error; /* Make sure it has a valid SquashFS magic number*/ if (get_unaligned_le32(&sblk->s_magic) != SQFS_MAGIC_NUMBER) { -- 2.7.4