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

2008-07-02 Pavel Roskin <proski@gnu.org>

Browse source 
* fs/xfs.c (struct grub_xfs_dir_header): Use names similar to
	those in Linux XFS code.  Provide a way to access 64-bit parent
	inode.
	(grub_xfs_iterate_dir): Use the new names.  Avoid reading past
	the end of struct grub_xfs_dir_header.
This commit is contained in:
proski 2008-07-02 18:40:32 +00:00
parent d4156eeedf
commit d4c9b428e1
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-07-02 Pavel Roskin <proski@gnu.org>
* fs/xfs.c (struct grub_xfs_dir_header): Use names similar to
those in Linux XFS code. Provide a way to access 64-bit parent
inode.
(grub_xfs_iterate_dir): Use the new names. Avoid reading past
the end of struct grub_xfs_dir_header.
2008-07-02 Bean <bean123ch@gmail.com> 2008-07-02 Bean <bean123ch@gmail.com>
* include/grub/ieee1275.h (grub_ieee1275_flag): New constant * include/grub/ieee1275.h (grub_ieee1275_flag): New constant

18
fs/xfs.c
View file

@ -55,9 +55,13 @@ struct grub_xfs_sblock
struct grub_xfs_dir_header struct grub_xfs_dir_header
{ {
grub_uint8_t entries; grub_uint8_t count;
grub_uint8_t smallino; grub_uint8_t i8count;
grub_uint32_t parent; union
{
grub_uint32_t i4;
grub_uint64_t i8;
} parent __attribute__ ((packed));
} __attribute__ ((packed)); } __attribute__ ((packed));
struct grub_xfs_dir_entry struct grub_xfs_dir_entry
@ -419,7 +423,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
case XFS_INODE_FORMAT_INO: case XFS_INODE_FORMAT_INO:
{ {
struct grub_xfs_dir_entry *de = &diro->inode.data.dir.direntry[0]; struct grub_xfs_dir_entry *de = &diro->inode.data.dir.direntry[0];
int smallino = !diro->inode.data.dir.dirhead.smallino; int smallino = !diro->inode.data.dir.dirhead.i8count;
int i; int i;
grub_uint64_t parent; grub_uint64_t parent;
@ -427,12 +431,12 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
parent inode number is small too. */ parent inode number is small too. */
if (smallino) if (smallino)
{ {
parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent); parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent.i4);
parent = grub_cpu_to_be64 (parent); parent = grub_cpu_to_be64 (parent);
} }
else else
{ {
parent = *(grub_uint64_t *) &diro->inode.data.dir.dirhead.parent; parent = diro->inode.data.dir.dirhead.parent.i8;
/* The header is a bit bigger than usual. */ /* The header is a bit bigger than usual. */
de = (struct grub_xfs_dir_entry *) ((char *) de + 4); de = (struct grub_xfs_dir_entry *) ((char *) de + 4);
} }
@ -444,7 +448,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
if (call_hook (parent, "..")) if (call_hook (parent, ".."))
return 1; return 1;
for (i = 0; i < diro->inode.data.dir.dirhead.entries; i++) for (i = 0; i < diro->inode.data.dir.dirhead.count; i++)
{ {
grub_uint64_t ino; grub_uint64_t ino;
void *inopos = (((char *) de) void *inopos = (((char *) de)