From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F209130B51E for ; Mon, 13 Oct 2025 20:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760388090; cv=none; b=iF8iCA0ZcWs5WcNPRYMs9Sxdkr+OKrujaX6dF+KyrU3Qiu2ayYeUAWoIHHxMy45jWJawTZ7KQRMfUCYePTeF6ZrLV53LWbm68EJSwI1k0iXCNTZfJRnaV0TAUd9lTZS20/vB7bzGXfZ2CUu7aWsnOH0+iw7wDaLJpfhqOM1urUw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760388090; c=relaxed/simple; bh=dZZVjMZlX27ZuQusbI2TT5vrXyNcbiQ1O8qfhefjGXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lZfph/gdEsCAfwzZvA04k4mWAl6RzYeNn7YY046hBBqt3nBFQp0+0JyHx5c5C7ndKy/UVh8jq6umFZ4LMYLqUNO0OIcuFmwk3zcGrXPxMwJ0iK4FRyhetqMxqNf7mGPBmWyPdLeM7PbSmMUIH+2Wy1+0FPz/fjjDjbEkgqcilTk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=frhPHvkW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="frhPHvkW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44F1FC4CEF8; Mon, 13 Oct 2025 20:41:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760388089; bh=dZZVjMZlX27ZuQusbI2TT5vrXyNcbiQ1O8qfhefjGXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=frhPHvkWs2YPVZ2lK3QuMFyiQUTinWD8KQOYocurLhrhR03Zjv3K5zrk2VwBs/bIT Kt5KHP9bZLyl+MDSNV/ra6NSNS3IGdgg/fV6kSaIeZKwPPXqbCNSVmRZ2F28sGa0YC 1mjdsDW5cLg0LwwwZikUtLhKDeH5xt2WnRQbpDG/zW7+mpsBQ2339CKjCVFNAdgJF4 Z5d1gceHJgekEIpvzInObXqdFGzRDAtRz0VUK9Iz33marxGJR4LpaQKBVjo13U3H7e hYDiS3zj+ERhorrwy44jKvcKeai7SejWzLk+GTTmVM7bWPMK5W7ZylM/oDg/sylyrc JKQ44tqpIg+Lg== From: Sasha Levin To: stable@vger.kernel.org Cc: Phillip Lougher , Andrew Morton , Sasha Levin Subject: [PATCH 6.1.y 1/2] Squashfs: add additional inode sanity checking Date: Mon, 13 Oct 2025 16:41:26 -0400 Message-ID: <20251013204127.3599792-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025101320-padding-swagger-0208@gregkh> References: <2025101320-padding-swagger-0208@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Phillip Lougher [ Upstream commit 9ee94bfbe930a1b39df53fa2d7b31141b780eb5a ] Patch series "Squashfs: performance improvement and a sanity check". This patchset adds an additional sanity check when reading regular file inodes, and adds support for SEEK_DATA/SEEK_HOLE lseek() whence values. This patch (of 2): Add an additional sanity check when reading regular file inodes. A regular file if the file size is an exact multiple of the filesystem block size cannot have a fragment. This is because by definition a fragment block stores tailends which are not a whole block in size. Link: https://lkml.kernel.org/r/20250923220652.568416-1-phillip@squashfs.org.uk Link: https://lkml.kernel.org/r/20250923220652.568416-2-phillip@squashfs.org.uk Signed-off-by: Phillip Lougher Signed-off-by: Andrew Morton Stable-dep-of: 9f1c14c1de1b ("Squashfs: reject negative file sizes in squashfs_read_inode()") Signed-off-by: Sasha Levin --- fs/squashfs/inode.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index 95a9ff9e23997..eb6f577154d59 100644 --- a/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c @@ -140,8 +140,17 @@ int squashfs_read_inode(struct inode *inode, long long ino) if (err < 0) goto failed_read; + inode->i_size = le32_to_cpu(sqsh_ino->file_size); frag = le32_to_cpu(sqsh_ino->fragment); if (frag != SQUASHFS_INVALID_FRAG) { + /* + * the file cannot have a fragment (tailend) and have a + * file size a multiple of the block size + */ + if ((inode->i_size & (msblk->block_size - 1)) == 0) { + err = -EINVAL; + goto failed_read; + } frag_offset = le32_to_cpu(sqsh_ino->offset); frag_size = squashfs_frag_lookup(sb, frag, &frag_blk); if (frag_size < 0) { @@ -155,7 +164,6 @@ int squashfs_read_inode(struct inode *inode, long long ino) } set_nlink(inode, 1); - inode->i_size = le32_to_cpu(sqsh_ino->file_size); inode->i_fop = &generic_ro_fops; inode->i_mode |= S_IFREG; inode->i_blocks = ((inode->i_size - 1) >> 9) + 1; @@ -183,8 +191,17 @@ int squashfs_read_inode(struct inode *inode, long long ino) if (err < 0) goto failed_read; + inode->i_size = le64_to_cpu(sqsh_ino->file_size); frag = le32_to_cpu(sqsh_ino->fragment); if (frag != SQUASHFS_INVALID_FRAG) { + /* + * the file cannot have a fragment (tailend) and have a + * file size a multiple of the block size + */ + if ((inode->i_size & (msblk->block_size - 1)) == 0) { + err = -EINVAL; + goto failed_read; + } frag_offset = le32_to_cpu(sqsh_ino->offset); frag_size = squashfs_frag_lookup(sb, frag, &frag_blk); if (frag_size < 0) { @@ -199,7 +216,6 @@ int squashfs_read_inode(struct inode *inode, long long ino) xattr_id = le32_to_cpu(sqsh_ino->xattr); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink)); - inode->i_size = le64_to_cpu(sqsh_ino->file_size); inode->i_op = &squashfs_inode_ops; inode->i_fop = &generic_ro_fops; inode->i_mode |= S_IFREG; -- 2.51.0