|
@@ -1175,15 +1175,19 @@ next:
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int extref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
|
|
|
|
- u32 *namelen, char **name, u64 *index,
|
|
|
|
- u64 *parent_objectid)
|
|
|
|
|
|
+static int extref_get_fields(struct extent_buffer *eb, int slot,
|
|
|
|
+ unsigned long ref_ptr, u32 *namelen, char **name,
|
|
|
|
+ u64 *index, u64 *parent_objectid)
|
|
{
|
|
{
|
|
struct btrfs_inode_extref *extref;
|
|
struct btrfs_inode_extref *extref;
|
|
|
|
|
|
extref = (struct btrfs_inode_extref *)ref_ptr;
|
|
extref = (struct btrfs_inode_extref *)ref_ptr;
|
|
|
|
|
|
*namelen = btrfs_inode_extref_name_len(eb, extref);
|
|
*namelen = btrfs_inode_extref_name_len(eb, extref);
|
|
|
|
+ if (!btrfs_is_name_len_valid(eb, slot, (unsigned long)&extref->name,
|
|
|
|
+ *namelen))
|
|
|
|
+ return -EIO;
|
|
|
|
+
|
|
*name = kmalloc(*namelen, GFP_NOFS);
|
|
*name = kmalloc(*namelen, GFP_NOFS);
|
|
if (*name == NULL)
|
|
if (*name == NULL)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
@@ -1198,14 +1202,19 @@ static int extref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int ref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
|
|
|
|
- u32 *namelen, char **name, u64 *index)
|
|
|
|
|
|
+static int ref_get_fields(struct extent_buffer *eb, int slot,
|
|
|
|
+ unsigned long ref_ptr, u32 *namelen, char **name,
|
|
|
|
+ u64 *index)
|
|
{
|
|
{
|
|
struct btrfs_inode_ref *ref;
|
|
struct btrfs_inode_ref *ref;
|
|
|
|
|
|
ref = (struct btrfs_inode_ref *)ref_ptr;
|
|
ref = (struct btrfs_inode_ref *)ref_ptr;
|
|
|
|
|
|
*namelen = btrfs_inode_ref_name_len(eb, ref);
|
|
*namelen = btrfs_inode_ref_name_len(eb, ref);
|
|
|
|
+ if (!btrfs_is_name_len_valid(eb, slot, (unsigned long)(ref + 1),
|
|
|
|
+ *namelen))
|
|
|
|
+ return -EIO;
|
|
|
|
+
|
|
*name = kmalloc(*namelen, GFP_NOFS);
|
|
*name = kmalloc(*namelen, GFP_NOFS);
|
|
if (*name == NULL)
|
|
if (*name == NULL)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
@@ -1280,8 +1289,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
|
|
|
|
|
|
while (ref_ptr < ref_end) {
|
|
while (ref_ptr < ref_end) {
|
|
if (log_ref_ver) {
|
|
if (log_ref_ver) {
|
|
- ret = extref_get_fields(eb, ref_ptr, &namelen, &name,
|
|
|
|
- &ref_index, &parent_objectid);
|
|
|
|
|
|
+ ret = extref_get_fields(eb, slot, ref_ptr, &namelen,
|
|
|
|
+ &name, &ref_index, &parent_objectid);
|
|
/*
|
|
/*
|
|
* parent object can change from one array
|
|
* parent object can change from one array
|
|
* item to another.
|
|
* item to another.
|
|
@@ -1293,8 +1302,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- ret = ref_get_fields(eb, ref_ptr, &namelen, &name,
|
|
|
|
- &ref_index);
|
|
|
|
|
|
+ ret = ref_get_fields(eb, slot, ref_ptr, &namelen,
|
|
|
|
+ &name, &ref_index);
|
|
}
|
|
}
|
|
if (ret)
|
|
if (ret)
|
|
goto out;
|
|
goto out;
|