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 34C3F605BC; Tue, 13 Feb 2024 00:21:13 +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=1707783673; cv=none; b=YNMK1e2M4OOK0Dkv830XdbhpsKjzp6YdvF6Fsi7/pBBAipSz+Pv2kcbQ7VIxv0td6y6dRyCtJzezc4NXXmHHKBPXZ/GpERIUmdxHVVnduhx+LJZvG790YimYRw5QEX4waXIkj7Z6uNukbRzWDnodAWxUomhQX5bctcT+qW1scdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783673; c=relaxed/simple; bh=wCKzP7n+6Ir3EKm/jEYXZyJHKFgZGj1hfyC0c3uHNIw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MMljzS8XLRGjiG5asQa8S3guC0+0qEYNPgAs+px6qQRz+H6o2FKMMnGi9jILkHMUB/duwLh80zwZdF2RRULevJ2lQhs/JbMdLCAB2nJI2DGtlpSYO0W81yyIB3cIk6XtXn9z4pHgx5D+4JKEMqZJO7g0vuDd1Ql+OudWpK0cwTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iH8n9gp3; 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="iH8n9gp3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E841C43394; Tue, 13 Feb 2024 00:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707783673; bh=wCKzP7n+6Ir3EKm/jEYXZyJHKFgZGj1hfyC0c3uHNIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iH8n9gp3Kf4dtqWwEzmq/C0UX3OVBX4wuwntmXJcNEyGuAow6NZVNNT3EGyBOw1Zw oVhFHEE8+LZxA0nc8RTPcrTe2kwl2U/LyLPDWkU6LYRDjVciGQSn4vwc7fX6RNFqwP +kfSc0h4hE3qkepWl0EkYbTvHO8nKDEU99cZSdv6SVCCSHsLWecWk5m8rBFlzfDdoL QEmEaY1/xpjguEOAcDGSPSpLWHMg/JdQLxHqCQgCzFxl7+znJXhQ9oDkA70DVB9pFR OIUxmEdSTnlcn8cFCRVzI316LWj3yGs/HfBIeo5ysna9jCFJgfxSlmiHYKbjSX9Ewn dWCde1Z3NE29Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Komarov , Sasha Levin , ntfs3@lists.linux.dev Subject: [PATCH AUTOSEL 6.6 17/51] fs/ntfs3: Prevent generic message "attempt to access beyond end of device" Date: Mon, 12 Feb 2024 19:19:54 -0500 Message-ID: <20240213002052.670571-17-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213002052.670571-1-sashal@kernel.org> References: <20240213002052.670571-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: ntfs3@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.16 Content-Transfer-Encoding: 8bit From: Konstantin Komarov [ Upstream commit 5ca87d01eba7bdfe9536a157ca33c1455bb8d16c ] It used in test environment. Signed-off-by: Konstantin Komarov Signed-off-by: Sasha Levin --- fs/ntfs3/fsntfs.c | 24 ++++++++++++++++++++++++ fs/ntfs3/ntfs_fs.h | 14 +------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index 350461d8cece..c66b0eab6a16 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -1007,6 +1007,30 @@ static inline __le32 security_hash(const void *sd, size_t bytes) return cpu_to_le32(hash); } +/* + * simple wrapper for sb_bread_unmovable. + */ +struct buffer_head *ntfs_bread(struct super_block *sb, sector_t block) +{ + struct ntfs_sb_info *sbi = sb->s_fs_info; + struct buffer_head *bh; + + if (unlikely(block >= sbi->volume.blocks)) { + /* prevent generic message "attempt to access beyond end of device" */ + ntfs_err(sb, "try to read out of volume at offset 0x%llx", + (u64)block << sb->s_blocksize_bits); + return NULL; + } + + bh = sb_bread_unmovable(sb, block); + if (bh) + return bh; + + ntfs_err(sb, "failed to read volume at offset 0x%llx", + (u64)block << sb->s_blocksize_bits); + return NULL; +} + int ntfs_sb_read(struct super_block *sb, u64 lbo, size_t bytes, void *buffer) { struct block_device *bdev = sb->s_bdev; diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h index f4c0a424a0ea..b1bdf54d275e 100644 --- a/fs/ntfs3/ntfs_fs.h +++ b/fs/ntfs3/ntfs_fs.h @@ -586,6 +586,7 @@ bool check_index_header(const struct INDEX_HDR *hdr, size_t bytes); int log_replay(struct ntfs_inode *ni, bool *initialized); /* Globals from fsntfs.c */ +struct buffer_head *ntfs_bread(struct super_block *sb, sector_t block); bool ntfs_fix_pre_write(struct NTFS_RECORD_HEADER *rhdr, size_t bytes); int ntfs_fix_post_read(struct NTFS_RECORD_HEADER *rhdr, size_t bytes, bool simple); @@ -1032,19 +1033,6 @@ static inline u64 bytes_to_block(const struct super_block *sb, u64 size) return (size + sb->s_blocksize - 1) >> sb->s_blocksize_bits; } -static inline struct buffer_head *ntfs_bread(struct super_block *sb, - sector_t block) -{ - struct buffer_head *bh = sb_bread_unmovable(sb, block); - - if (bh) - return bh; - - ntfs_err(sb, "failed to read volume at offset 0x%llx", - (u64)block << sb->s_blocksize_bits); - return NULL; -} - static inline struct ntfs_inode *ntfs_i(struct inode *inode) { return container_of(inode, struct ntfs_inode, vfs_inode); -- 2.43.0