From 176c162b30324bbb6cf06797069d41eab7b47f97 Mon Sep 17 00:00:00 2001 From: Abhi Das Date: Mon, 30 May 2022 22:57:13 -0500 Subject: [PATCH] squashfs-tools: CVE-2021-40153 unvalidated filepaths allow writing outside of destination --- .squashfs-tools.metadata | 3 + bz2000638.patch | 231 +++++++++++++++++++++++++++++++++++++++ squashfs-tools.spec | 8 +- 3 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 .squashfs-tools.metadata create mode 100644 bz2000638.patch diff --git a/.squashfs-tools.metadata b/.squashfs-tools.metadata new file mode 100644 index 0000000..488b51b --- /dev/null +++ b/.squashfs-tools.metadata @@ -0,0 +1,3 @@ +ccdbdb36be907de767019f2f35e985c6fad1bc2c 4.4-git.1.tar.gz +35fd7f626fc3259edce72cb0e3f3656a90d1e03f mksquashfs.1 +e9e8ab48d8d38eae19affcd515a94497d21199ac unsquashfs.1 diff --git a/bz2000638.patch b/bz2000638.patch new file mode 100644 index 0000000..1f40b47 --- /dev/null +++ b/bz2000638.patch @@ -0,0 +1,231 @@ +diff -Nupr a/squashfs-tools/Makefile b/squashfs-tools/Makefile +--- a/squashfs-tools/Makefile 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/Makefile 2021-10-01 09:21:50.323315827 -0500 +@@ -156,7 +156,8 @@ MKSQUASHFS_OBJS = mksquashfs.o read_fs.o + caches-queues-lists.o + + UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \ +- unsquash-4.o unsquash-123.o unsquash-34.o swap.o compressor.o unsquashfs_info.o ++ unsquash-4.o unsquash-123.o unsquash-34.o unsquash-1234.o swap.o \ ++ compressor.o unsquashfs_info.o + + CFLAGS ?= -O2 + CFLAGS += $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 \ +@@ -350,6 +351,8 @@ unsquash-123.o: unsquashfs.h unsquash-12 + + unsquash-34.o: unsquashfs.h unsquash-34.c + ++unsquash-1234.o: unsquash-1234.c ++ + unsquashfs_xattr.o: unsquashfs_xattr.c unsquashfs.h squashfs_fs.h xattr.h + + unsquashfs_info.o: unsquashfs.h squashfs_fs.h +diff -Nupr a/squashfs-tools/unsquash-1234.c b/squashfs-tools/unsquash-1234.c +--- a/squashfs-tools/unsquash-1234.c 1969-12-31 18:00:00.000000000 -0600 ++++ b/squashfs-tools/unsquash-1234.c 2021-10-01 09:21:50.323315827 -0500 +@@ -0,0 +1,58 @@ ++/* ++ * Unsquash a squashfs filesystem. This is a highly compressed read only ++ * filesystem. ++ * ++ * Copyright (c) 2021 ++ * Phillip Lougher ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2, ++ * or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * unsquash-1234.c ++ * ++ * Helper functions used by unsquash-1, unsquash-2, unsquash-3 and ++ * unsquash-4. ++ */ ++ ++#define TRUE 1 ++#define FALSE 0 ++/* ++ * Check name for validity, name should not ++ * - be ".", "./", or ++ * - be "..", "../" or ++ * - have a "/" anywhere in the name, or ++ * - be shorter than the expected size ++ */ ++int check_name(char *name, int size) ++{ ++ char *start = name; ++ ++ if(name[0] == '.') { ++ if(name[1] == '.') ++ name++; ++ if(name[1] == '/' || name[1] == '\0') ++ return FALSE; ++ } ++ ++ while(name[0] != '/' && name[0] != '\0') ++ name ++; ++ ++ if(name[0] == '/') ++ return FALSE; ++ ++ if((name - start) != size) ++ return FALSE; ++ ++ return TRUE; ++} +diff -Nupr a/squashfs-tools/unsquash-1.c b/squashfs-tools/unsquash-1.c +--- a/squashfs-tools/unsquash-1.c 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/unsquash-1.c 2021-10-01 09:21:50.323315827 -0500 +@@ -2,7 +2,7 @@ + * Unsquash a squashfs filesystem. This is a highly compressed read only + * filesystem. + * +- * Copyright (c) 2009, 2010, 2011, 2012, 2019 ++ * Copyright (c) 2009, 2010, 2011, 2012, 2019, 2021 + * Phillip Lougher + * + * This program is free software; you can redistribute it and/or +@@ -285,6 +285,13 @@ static struct dir *squashfs_opendir(unsi + memcpy(dire->name, directory_table + bytes, + dire->size + 1); + dire->name[dire->size + 1] = '\0'; ++ ++ /* check name for invalid characters (i.e /, ., ..) */ ++ if(check_name(dire->name, dire->size + 1) == FALSE) { ++ ERROR("File system corrupted: invalid characters in name\n"); ++ goto corrupted; ++ } ++ + TRACE("squashfs_opendir: directory entry %s, inode " + "%d:%d, type %d\n", dire->name, + dirh.start_block, dire->offset, dire->type); +diff -Nupr a/squashfs-tools/unsquash-2.c b/squashfs-tools/unsquash-2.c +--- a/squashfs-tools/unsquash-2.c 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/unsquash-2.c 2021-10-01 09:21:50.323315827 -0500 +@@ -2,7 +2,7 @@ + * Unsquash a squashfs filesystem. This is a highly compressed read only + * filesystem. + * +- * Copyright (c) 2009, 2010, 2013, 2019 ++ * Copyright (c) 2009, 2010, 2013, 2019, 2021 + * Phillip Lougher + * + * This program is free software; you can redistribute it and/or +@@ -386,6 +386,13 @@ static struct dir *squashfs_opendir(unsi + memcpy(dire->name, directory_table + bytes, + dire->size + 1); + dire->name[dire->size + 1] = '\0'; ++ ++ /* check name for invalid characters (i.e /, ., ..) */ ++ if(check_name(dire->name, dire->size + 1) == FALSE) { ++ ERROR("File system corrupted: invalid characters in name\n"); ++ goto corrupted; ++ } ++ + TRACE("squashfs_opendir: directory entry %s, inode " + "%d:%d, type %d\n", dire->name, + dirh.start_block, dire->offset, dire->type); +diff -Nupr a/squashfs-tools/unsquash-3.c b/squashfs-tools/unsquash-3.c +--- a/squashfs-tools/unsquash-3.c 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/unsquash-3.c 2021-10-01 09:21:50.324315841 -0500 +@@ -2,7 +2,7 @@ + * Unsquash a squashfs filesystem. This is a highly compressed read only + * filesystem. + * +- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2019 ++ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2019, 2021 + * Phillip Lougher + * + * This program is free software; you can redistribute it and/or +@@ -413,6 +413,13 @@ static struct dir *squashfs_opendir(unsi + memcpy(dire->name, directory_table + bytes, + dire->size + 1); + dire->name[dire->size + 1] = '\0'; ++ ++ /* check name for invalid characters (i.e /, ., ..) */ ++ if(check_name(dire->name, dire->size + 1) == FALSE) { ++ ERROR("File system corrupted: invalid characters in name\n"); ++ goto corrupted; ++ } ++ + TRACE("squashfs_opendir: directory entry %s, inode " + "%d:%d, type %d\n", dire->name, + dirh.start_block, dire->offset, dire->type); +diff -Nupr a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c +--- a/squashfs-tools/unsquash-4.c 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/unsquash-4.c 2021-10-01 09:21:50.324315841 -0500 +@@ -2,7 +2,7 @@ + * Unsquash a squashfs filesystem. This is a highly compressed read only + * filesystem. + * +- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2019 ++ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2019, 2021 + * Phillip Lougher + * + * This program is free software; you can redistribute it and/or +@@ -349,6 +349,13 @@ static struct dir *squashfs_opendir(unsi + memcpy(dire->name, directory_table + bytes, + dire->size + 1); + dire->name[dire->size + 1] = '\0'; ++ ++ /* check name for invalid characters (i.e /, ., ..) */ ++ if(check_name(dire->name, dire->size + 1) == FALSE) { ++ ERROR("File system corrupted: invalid characters in name\n"); ++ goto corrupted; ++ } ++ + TRACE("squashfs_opendir: directory entry %s, inode " + "%d:%d, type %d\n", dire->name, + dirh.start_block, dire->offset, dire->type); +diff -Nupr a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +--- a/squashfs-tools/unsquashfs.c 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/unsquashfs.c 2021-10-01 09:23:29.009735964 -0500 +@@ -3,7 +3,7 @@ + * filesystem. + * + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +- * 2012, 2013, 2014, 2017, 2019 ++ * 2012, 2013, 2014, 2017, 2019, 2021 + * Phillip Lougher + * + * This program is free software; you can redistribute it and/or +@@ -2620,8 +2620,8 @@ int parse_number(char *start, int *res) + + + #define VERSION() \ +- printf("unsquashfs version 4.4-git.1 (2020/10/30)\n");\ +- printf("copyright (C) 2020 Phillip Lougher "\ ++ printf("unsquashfs version 4.4-git.1 (2021/1/17)\n");\ ++ printf("copyright (C) 2021 Phillip Lougher "\ + "\n\n");\ + printf("This program is free software; you can redistribute it and/or"\ + "\n");\ +diff -Nupr a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h +--- a/squashfs-tools/unsquashfs.h 2020-10-30 06:13:56.000000000 -0500 ++++ b/squashfs-tools/unsquashfs.h 2021-10-01 09:21:50.325315855 -0500 +@@ -4,7 +4,7 @@ + * Unsquash a squashfs filesystem. This is a highly compressed read only + * filesystem. + * +- * Copyright (c) 2009, 2010, 2013, 2014, 2019 ++ * Copyright (c) 2009, 2010, 2013, 2014, 2019, 2021 + * Phillip Lougher + * + * This program is free software; you can redistribute it and/or +@@ -261,4 +261,7 @@ extern int read_ids(int, long long, long + + /* unsquash-34.c */ + extern long long *alloc_index_table(int); ++ ++/* unsquash-1234.c */ ++extern int check_name(char *, int); + #endif diff --git a/squashfs-tools.spec b/squashfs-tools.spec index a816b16..12dfff5 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -2,7 +2,7 @@ Summary: Utility for the creation of squashfs filesystems %global forgeurl https://github.com/plougher/squashfs-tools Version: 4.4 Name: squashfs-tools -Release: 8.git1%{?dist} +Release: 9.git1%{?dist} License: GPLv2+ URL: %{forgeurl}/archive/4.4-git.1.tar.gz Source: 4.4-git.1.tar.gz @@ -12,6 +12,7 @@ Source1: mksquashfs.1 Source2: unsquashfs.1 Patch0: bz2023218.patch +Patch1: bz2000638.patch BuildRequires: make BuildRequires: gcc @@ -29,6 +30,7 @@ contains the utilities for manipulating squashfs filesystems. %prep %setup -n %{name}-4.4-git.1 %patch0 -p1 +%patch1 -p1 %build %set_build_flags @@ -52,6 +54,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Mon May 30 2022 Abhi Das - 4.4-9.git1 +- CVE-2021-40153 squashfs-tools: unvalidated filepaths allow writing outside of destination + rhbz#2000638 + * Wed Jan 12 2022 Abhi Das - 4.4-8.git1 - limit CPUs on large machines to avoid running out of resources rhbz#2023218