mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	fs/ntfs3: Prevent generic message "attempt to access beyond end of device"
It used in test environment. Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
		
							parent
							
								
									d6d33f03ba
								
							
						
					
					
						commit
						5ca87d01eb
					
				
					 2 changed files with 25 additions and 13 deletions
				
			
		| 
						 | 
				
			
			@ -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;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue