Skip to content

Commit bae15d9

Browse files
adam900710kdave
adam900710
authored and
kdave
committed
btrfs: Cleanup existing name_len checks
Since tree-checker has verified leaf when reading from disk, we don't need the existing verify_dir_item() or btrfs_is_name_len_valid() checks. Signed-off-by: Qu Wenruo <[email protected]> Reviewed-by: Nikolay Borisov <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent ad7b036 commit bae15d9

File tree

9 files changed

+9
-186
lines changed

9 files changed

+9
-186
lines changed

‎fs/btrfs/ctree.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3060,15 +3060,10 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,
30603060
struct btrfs_path *path, u64 dir,
30613061
const char *name, u16 name_len,
30623062
int mod);
3063-
int verify_dir_item(struct btrfs_fs_info *fs_info,
3064-
struct extent_buffer *leaf, int slot,
3065-
struct btrfs_dir_item *dir_item);
30663063
struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,
30673064
struct btrfs_path *path,
30683065
const char *name,
30693066
int name_len);
3070-
bool btrfs_is_name_len_valid(struct extent_buffer *leaf, int slot,
3071-
unsigned long start, u16 name_len);
30723067

30733068
/* orphan.c */
30743069
int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,

‎fs/btrfs/dir-item.c

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,6 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,
403403
btrfs_dir_data_len(leaf, dir_item);
404404
name_ptr = (unsigned long)(dir_item + 1);
405405

406-
if (verify_dir_item(fs_info, leaf, path->slots[0], dir_item))
407-
return NULL;
408406
if (btrfs_dir_name_len(leaf, dir_item) == name_len &&
409407
memcmp_extent_buffer(leaf, name, name_ptr, name_len) == 0)
410408
return dir_item;
@@ -450,109 +448,3 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
450448
}
451449
return ret;
452450
}
453-
454-
int verify_dir_item(struct btrfs_fs_info *fs_info,
455-
struct extent_buffer *leaf,
456-
int slot,
457-
struct btrfs_dir_item *dir_item)
458-
{
459-
u16 namelen = BTRFS_NAME_LEN;
460-
int ret;
461-
u8 type = btrfs_dir_type(leaf, dir_item);
462-
463-
if (type >= BTRFS_FT_MAX) {
464-
btrfs_crit(fs_info, "invalid dir item type: %d", (int)type);
465-
return 1;
466-
}
467-
468-
if (type == BTRFS_FT_XATTR)
469-
namelen = XATTR_NAME_MAX;
470-
471-
if (btrfs_dir_name_len(leaf, dir_item) > namelen) {
472-
btrfs_crit(fs_info, "invalid dir item name len: %u",
473-
(unsigned)btrfs_dir_name_len(leaf, dir_item));
474-
return 1;
475-
}
476-
477-
namelen = btrfs_dir_name_len(leaf, dir_item);
478-
ret = btrfs_is_name_len_valid(leaf, slot,
479-
(unsigned long)(dir_item + 1), namelen);
480-
if (!ret)
481-
return 1;
482-
483-
/* BTRFS_MAX_XATTR_SIZE is the same for all dir items */
484-
if ((btrfs_dir_data_len(leaf, dir_item) +
485-
btrfs_dir_name_len(leaf, dir_item)) >
486-
BTRFS_MAX_XATTR_SIZE(fs_info)) {
487-
btrfs_crit(fs_info, "invalid dir item name + data len: %u + %u",
488-
(unsigned)btrfs_dir_name_len(leaf, dir_item),
489-
(unsigned)btrfs_dir_data_len(leaf, dir_item));
490-
return 1;
491-
}
492-
493-
return 0;
494-
}
495-
496-
bool btrfs_is_name_len_valid(struct extent_buffer *leaf, int slot,
497-
unsigned long start, u16 name_len)
498-
{
499-
struct btrfs_fs_info *fs_info = leaf->fs_info;
500-
struct btrfs_key key;
501-
u32 read_start;
502-
u32 read_end;
503-
u32 item_start;
504-
u32 item_end;
505-
u32 size;
506-
bool ret = true;
507-
508-
ASSERT(start > BTRFS_LEAF_DATA_OFFSET);
509-
510-
read_start = start - BTRFS_LEAF_DATA_OFFSET;
511-
read_end = read_start + name_len;
512-
item_start = btrfs_item_offset_nr(leaf, slot);
513-
item_end = btrfs_item_end_nr(leaf, slot);
514-
515-
btrfs_item_key_to_cpu(leaf, &key, slot);
516-
517-
switch (key.type) {
518-
case BTRFS_DIR_ITEM_KEY:
519-
case BTRFS_XATTR_ITEM_KEY:
520-
case BTRFS_DIR_INDEX_KEY:
521-
size = sizeof(struct btrfs_dir_item);
522-
break;
523-
case BTRFS_INODE_REF_KEY:
524-
size = sizeof(struct btrfs_inode_ref);
525-
break;
526-
case BTRFS_INODE_EXTREF_KEY:
527-
size = sizeof(struct btrfs_inode_extref);
528-
break;
529-
case BTRFS_ROOT_REF_KEY:
530-
case BTRFS_ROOT_BACKREF_KEY:
531-
size = sizeof(struct btrfs_root_ref);
532-
break;
533-
default:
534-
ret = false;
535-
goto out;
536-
}
537-
538-
if (read_start < item_start) {
539-
ret = false;
540-
goto out;
541-
}
542-
if (read_end > item_end) {
543-
ret = false;
544-
goto out;
545-
}
546-
547-
/* there shall be item(s) before name */
548-
if (read_start - item_start < size) {
549-
ret = false;
550-
goto out;
551-
}
552-
553-
out:
554-
if (!ret)
555-
btrfs_crit(fs_info, "invalid dir item name len: %u",
556-
(unsigned int)name_len);
557-
return ret;
558-
}

‎fs/btrfs/export.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,6 @@ static int btrfs_get_name(struct dentry *parent, char *name,
283283
name_len = btrfs_inode_ref_name_len(leaf, iref);
284284
}
285285

286-
ret = btrfs_is_name_len_valid(leaf, path->slots[0], name_ptr, name_len);
287-
if (!ret) {
288-
btrfs_free_path(path);
289-
return -EIO;
290-
}
291286
read_extent_buffer(leaf, name, name_ptr, name_len);
292287
btrfs_free_path(path);
293288

‎fs/btrfs/inode.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5907,7 +5907,6 @@ static int btrfs_filldir(void *addr, int entries, struct dir_context *ctx)
59075907
static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
59085908
{
59095909
struct inode *inode = file_inode(file);
5910-
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
59115910
struct btrfs_root *root = BTRFS_I(inode)->root;
59125911
struct btrfs_file_private *private = file->private_data;
59135912
struct btrfs_dir_item *di;
@@ -5975,9 +5974,6 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)
59755974
if (btrfs_should_delete_dir_index(&del_list, found_key.offset))
59765975
goto next;
59775976
di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item);
5978-
if (verify_dir_item(fs_info, leaf, slot, di))
5979-
goto next;
5980-
59815977
name_len = btrfs_dir_name_len(leaf, di);
59825978
if ((total_len + sizeof(struct dir_entry) + name_len) >=
59835979
PAGE_SIZE) {

‎fs/btrfs/props.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ static int iterate_object_props(struct btrfs_root *root,
164164
size_t),
165165
void *ctx)
166166
{
167-
struct btrfs_fs_info *fs_info = root->fs_info;
168167
int ret;
169168
char *name_buf = NULL;
170169
char *value_buf = NULL;
@@ -215,12 +214,6 @@ static int iterate_object_props(struct btrfs_root *root,
215214
name_ptr = (unsigned long)(di + 1);
216215
data_ptr = name_ptr + name_len;
217216

218-
if (verify_dir_item(fs_info, leaf,
219-
path->slots[0], di)) {
220-
ret = -EIO;
221-
goto out;
222-
}
223-
224217
if (name_len <= XATTR_BTRFS_PREFIX_LEN ||
225218
memcmp_extent_buffer(leaf, XATTR_BTRFS_PREFIX,
226219
name_ptr,

‎fs/btrfs/root-tree.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,6 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans,
387387
WARN_ON(btrfs_root_ref_dirid(leaf, ref) != dirid);
388388
WARN_ON(btrfs_root_ref_name_len(leaf, ref) != name_len);
389389
ptr = (unsigned long)(ref + 1);
390-
ret = btrfs_is_name_len_valid(leaf, path->slots[0], ptr,
391-
name_len);
392-
if (!ret) {
393-
err = -EIO;
394-
goto out;
395-
}
396-
397390
WARN_ON(memcmp_extent_buffer(leaf, name, ptr, name_len));
398391
*sequence = btrfs_root_ref_sequence(leaf, ref);
399392

‎fs/btrfs/send.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,12 +1059,6 @@ static int iterate_dir_item(struct btrfs_root *root, struct btrfs_path *path,
10591059
}
10601060
}
10611061

1062-
ret = btrfs_is_name_len_valid(eb, path->slots[0],
1063-
(unsigned long)(di + 1), name_len + data_len);
1064-
if (!ret) {
1065-
ret = -EIO;
1066-
goto out;
1067-
}
10681062
if (name_len + data_len > buf_len) {
10691063
buf_len = name_len + data_len;
10701064
if (is_vmalloc_addr(buf)) {

‎fs/btrfs/tree-log.c

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,19 +1173,15 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans,
11731173
return 0;
11741174
}
11751175

1176-
static int extref_get_fields(struct extent_buffer *eb, int slot,
1177-
unsigned long ref_ptr, u32 *namelen, char **name,
1178-
u64 *index, u64 *parent_objectid)
1176+
static int extref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
1177+
u32 *namelen, char **name, u64 *index,
1178+
u64 *parent_objectid)
11791179
{
11801180
struct btrfs_inode_extref *extref;
11811181

11821182
extref = (struct btrfs_inode_extref *)ref_ptr;
11831183

11841184
*namelen = btrfs_inode_extref_name_len(eb, extref);
1185-
if (!btrfs_is_name_len_valid(eb, slot, (unsigned long)&extref->name,
1186-
*namelen))
1187-
return -EIO;
1188-
11891185
*name = kmalloc(*namelen, GFP_NOFS);
11901186
if (*name == NULL)
11911187
return -ENOMEM;
@@ -1200,19 +1196,14 @@ static int extref_get_fields(struct extent_buffer *eb, int slot,
12001196
return 0;
12011197
}
12021198

1203-
static int ref_get_fields(struct extent_buffer *eb, int slot,
1204-
unsigned long ref_ptr, u32 *namelen, char **name,
1205-
u64 *index)
1199+
static int ref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
1200+
u32 *namelen, char **name, u64 *index)
12061201
{
12071202
struct btrfs_inode_ref *ref;
12081203

12091204
ref = (struct btrfs_inode_ref *)ref_ptr;
12101205

12111206
*namelen = btrfs_inode_ref_name_len(eb, ref);
1212-
if (!btrfs_is_name_len_valid(eb, slot, (unsigned long)(ref + 1),
1213-
*namelen))
1214-
return -EIO;
1215-
12161207
*name = kmalloc(*namelen, GFP_NOFS);
12171208
if (*name == NULL)
12181209
return -ENOMEM;
@@ -1287,8 +1278,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
12871278

12881279
while (ref_ptr < ref_end) {
12891280
if (log_ref_ver) {
1290-
ret = extref_get_fields(eb, slot, ref_ptr, &namelen,
1291-
&name, &ref_index, &parent_objectid);
1281+
ret = extref_get_fields(eb, ref_ptr, &namelen, &name,
1282+
&ref_index, &parent_objectid);
12921283
/*
12931284
* parent object can change from one array
12941285
* item to another.
@@ -1300,8 +1291,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
13001291
goto out;
13011292
}
13021293
} else {
1303-
ret = ref_get_fields(eb, slot, ref_ptr, &namelen,
1304-
&name, &ref_index);
1294+
ret = ref_get_fields(eb, ref_ptr, &namelen, &name,
1295+
&ref_index);
13051296
}
13061297
if (ret)
13071298
goto out;
@@ -1835,7 +1826,6 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,
18351826
struct extent_buffer *eb, int slot,
18361827
struct btrfs_key *key)
18371828
{
1838-
struct btrfs_fs_info *fs_info = root->fs_info;
18391829
int ret = 0;
18401830
u32 item_size = btrfs_item_size_nr(eb, slot);
18411831
struct btrfs_dir_item *di;
@@ -1848,8 +1838,6 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,
18481838
ptr_end = ptr + item_size;
18491839
while (ptr < ptr_end) {
18501840
di = (struct btrfs_dir_item *)ptr;
1851-
if (verify_dir_item(fs_info, eb, slot, di))
1852-
return -EIO;
18531841
name_len = btrfs_dir_name_len(eb, di);
18541842
ret = replay_one_name(trans, root, path, eb, di, key);
18551843
if (ret < 0)
@@ -2024,11 +2012,6 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,
20242012
ptr_end = ptr + item_size;
20252013
while (ptr < ptr_end) {
20262014
di = (struct btrfs_dir_item *)ptr;
2027-
if (verify_dir_item(fs_info, eb, slot, di)) {
2028-
ret = -EIO;
2029-
goto out;
2030-
}
2031-
20322015
name_len = btrfs_dir_name_len(eb, di);
20332016
name = kmalloc(name_len, GFP_NOFS);
20342017
if (!name) {
@@ -2109,7 +2092,6 @@ static int replay_xattr_deletes(struct btrfs_trans_handle *trans,
21092092
struct btrfs_path *path,
21102093
const u64 ino)
21112094
{
2112-
struct btrfs_fs_info *fs_info = root->fs_info;
21132095
struct btrfs_key search_key;
21142096
struct btrfs_path *log_path;
21152097
int i;
@@ -2151,11 +2133,6 @@ static int replay_xattr_deletes(struct btrfs_trans_handle *trans,
21512133
u32 this_len = sizeof(*di) + name_len + data_len;
21522134
char *name;
21532135

2154-
ret = verify_dir_item(fs_info, path->nodes[0], i, di);
2155-
if (ret) {
2156-
ret = -EIO;
2157-
goto out;
2158-
}
21592136
name = kmalloc(name_len, GFP_NOFS);
21602137
if (!name) {
21612138
ret = -ENOMEM;
@@ -4572,12 +4549,6 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,
45724549
this_len = sizeof(*extref) + this_name_len;
45734550
}
45744551

4575-
ret = btrfs_is_name_len_valid(eb, slot, name_ptr,
4576-
this_name_len);
4577-
if (!ret) {
4578-
ret = -EIO;
4579-
goto out;
4580-
}
45814552
if (this_name_len > name_len) {
45824553
char *new_name;
45834554

‎fs/btrfs/xattr.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
267267
{
268268
struct btrfs_key key;
269269
struct inode *inode = d_inode(dentry);
270-
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
271270
struct btrfs_root *root = BTRFS_I(inode)->root;
272271
struct btrfs_path *path;
273272
int ret = 0;
@@ -336,11 +335,6 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
336335
u32 this_len = sizeof(*di) + name_len + data_len;
337336
unsigned long name_ptr = (unsigned long)(di + 1);
338337

339-
if (verify_dir_item(fs_info, leaf, slot, di)) {
340-
ret = -EIO;
341-
goto err;
342-
}
343-
344338
total_size += name_len + 1;
345339
/*
346340
* We are just looking for how big our buffer needs to

0 commit comments

Comments
 (0)