vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/fs/ntfs.c: Handle 48-bit MFT no.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-21 12:58:38 +02:00
parent 1437da5440
commit 979d9f521d
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-10-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/ntfs.c: Handle 48-bit MFT no.
2013-10-21 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/ntfs.c (read_run_data): Rewrite using bitfields. * grub-core/fs/ntfs.c (read_run_data): Rewrite using bitfields.

22
grub-core/fs/ntfs.c
View file

@ -87,7 +87,7 @@ fixup (grub_uint8_t *buf, grub_size_t len, const grub_uint8_t *magic)
} }
static grub_err_t read_mft (struct grub_ntfs_data *data, grub_uint8_t *buf, static grub_err_t read_mft (struct grub_ntfs_data *data, grub_uint8_t *buf,
grub_uint32_t mftno); grub_uint64_t mftno);
static grub_err_t read_attr (struct grub_ntfs_attr *at, grub_uint8_t *dest, static grub_err_t read_attr (struct grub_ntfs_attr *at, grub_uint8_t *dest,
grub_disk_addr_t ofs, grub_size_t len, grub_disk_addr_t ofs, grub_size_t len,
int cached, int cached,
@ -488,17 +488,17 @@ read_attr (struct grub_ntfs_attr *at, grub_uint8_t *dest, grub_disk_addr_t ofs,
} }
static grub_err_t static grub_err_t
read_mft (struct grub_ntfs_data *data, grub_uint8_t *buf, grub_uint32_t mftno) read_mft (struct grub_ntfs_data *data, grub_uint8_t *buf, grub_uint64_t mftno)
{ {
if (read_attr if (read_attr
(&data->mmft.attr, buf, mftno * ((grub_disk_addr_t) data->mft_size << GRUB_NTFS_BLK_SHR), (&data->mmft.attr, buf, mftno * ((grub_disk_addr_t) data->mft_size << GRUB_NTFS_BLK_SHR),
data->mft_size << GRUB_NTFS_BLK_SHR, 0, 0, 0)) data->mft_size << GRUB_NTFS_BLK_SHR, 0, 0, 0))
return grub_error (GRUB_ERR_BAD_FS, "read MFT 0x%X fails", mftno); return grub_error (GRUB_ERR_BAD_FS, "read MFT 0x%llx fails", (unsigned long long) mftno);
return fixup (buf, data->mft_size, (const grub_uint8_t *) "FILE"); return fixup (buf, data->mft_size, (const grub_uint8_t *) "FILE");
} }
static grub_err_t static grub_err_t
init_file (struct grub_ntfs_file *mft, grub_uint32_t mftno) init_file (struct grub_ntfs_file *mft, grub_uint64_t mftno)
{ {
unsigned short flag; unsigned short flag;
@ -513,7 +513,8 @@ init_file (struct grub_ntfs_file *mft, grub_uint32_t mftno)
flag = u16at (mft->buf, 0x16); flag = u16at (mft->buf, 0x16);
if ((flag & 1) == 0) if ((flag & 1) == 0)
return grub_error (GRUB_ERR_BAD_FS, "MFT 0x%X is not in use", mftno); return grub_error (GRUB_ERR_BAD_FS, "MFT 0x%llx is not in use",
(unsigned long long) mftno);
if ((flag & 2) == 0) if ((flag & 2) == 0)
{ {
@ -521,7 +522,8 @@ init_file (struct grub_ntfs_file *mft, grub_uint32_t mftno)
pa = locate_attr (&mft->attr, mft, GRUB_NTFS_AT_DATA); pa = locate_attr (&mft->attr, mft, GRUB_NTFS_AT_DATA);
if (pa == NULL) if (pa == NULL)
return grub_error (GRUB_ERR_BAD_FS, "no $DATA in MFT 0x%X", mftno); return grub_error (GRUB_ERR_BAD_FS, "no $DATA in MFT 0x%llx",
(unsigned long long) mftno);
if (!pa[8]) if (!pa[8])
mft->size = u32at (pa, 0x10); mft->size = u32at (pa, 0x10);
@ -573,12 +575,6 @@ list_file (struct grub_ntfs_file *diro, grub_uint8_t *pos,
struct grub_ntfs_file *fdiro; struct grub_ntfs_file *fdiro;
grub_uint32_t attr; grub_uint32_t attr;
if (u16at (pos, 4))
{
grub_error (GRUB_ERR_BAD_FS, "64-bit MFT number");
return 0;
}
attr = u32at (pos, 0x48); attr = u32at (pos, 0x48);
if (attr & GRUB_NTFS_ATTR_REPARSE) if (attr & GRUB_NTFS_ATTR_REPARSE)
type = GRUB_FSHELP_SYMLINK; type = GRUB_FSHELP_SYMLINK;
@ -592,7 +588,7 @@ list_file (struct grub_ntfs_file *diro, grub_uint8_t *pos,
return 0; return 0;
fdiro->data = diro->data; fdiro->data = diro->data;
fdiro->ino = u32at (pos, 0); fdiro->ino = u64at (pos, 0) & 0xffffffffffffULL;
fdiro->mtime = u64at (pos, 0x20); fdiro->mtime = u64at (pos, 0x20);
ustr = grub_malloc (ns * GRUB_MAX_UTF8_PER_UTF16 + 1); ustr = grub_malloc (ns * GRUB_MAX_UTF8_PER_UTF16 + 1);

2
include/grub/ntfs.h
View file

@ -143,7 +143,7 @@ struct grub_ntfs_file
grub_uint8_t *buf; grub_uint8_t *buf;
grub_uint64_t size; grub_uint64_t size;
grub_uint64_t mtime; grub_uint64_t mtime;
grub_uint32_t ino; grub_uint64_t ino;
int inode_read; int inode_read;
struct grub_ntfs_attr attr; struct grub_ntfs_attr attr;
}; };