Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c394e458 authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

NTFS: Fix a 64-bitness bug where a left-shift could overflow a 32-bit variable 


      which we now cast to 64-bit first (fs/ntfs/mft.c::map_mft_record_page().

Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 18efefa9

fs/ntfs/layout.h

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ typedef le16 MFT_RECORD_FLAGS; 
 * Note: The _LE versions will return a CPU endian formatted value!

 */

#define MFT_REF_MASK_CPU 0x0000ffffffffffffULL

#define MFT_REF_MASK_LE const_cpu_to_le64(0x0000ffffffffffffULL)

#define MFT_REF_MASK_LE const_cpu_to_le64(MFT_REF_MASK_CPU)



typedef u64 MFT_REF;

typedef le64 leMFT_REF;

fs/ntfs/mft.c

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni) 
	 * overflowing the unsigned long, but I don't think we would ever get

	 * here if the volume was that big...

	 */

	index = ni->mft_no << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT;

	index = (u64)ni->mft_no << vol->mft_record_size_bits >>

			PAGE_CACHE_SHIFT;

	ofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;



	i_size = i_size_read(mft_vi);

fs/ntfs/unistr.c

+1 −1
Original line number Diff line number Diff line 
/*

 * unistr.c - NTFS Unicode string handling. Part of the Linux-NTFS project.

 *

 * Copyright (c) 2001-2004 Anton Altaparmakov

 * Copyright (c) 2001-2005 Anton Altaparmakov

 *

 * This program/include file is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as published