mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-06 04:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: replace some open coded corruption checks

Browse Source 
We can trivially do the simple check of value length against what the caller
expects in btree.c.

Signed-off-by: Mark Fasheh <mfasheh@versity.com>
Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Mark Fasheh
2016-10-27 14:24:40 -05:00
parent ebbb2e842e
commit 2fc1b99698
6 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kmod/src/btree.c
View File

@@ -138,6 +138,16 @@ static int copy_to_val(struct scoutfs_btree_val *val,
size_t off;
int i;
/*
* Corruption check, right now we just return -EIO if the
* caller wants this. In the future we can grow this to do
* different things (go readonly, ignore, return error) based
* on the severity of the problem.
*/
/* XXX corruption */
if (val->check_size_eq && val_len != scoutfs_btree_val_length(val))
return -EIO;
for (i = 0, off = 0; val_len > 0 && i < ARRAY_SIZE(val->vec); i++) {
kv = &val->vec[i];

1
kmod/src/btree.h
View File

@@ -5,6 +5,7 @@
struct scoutfs_btree_val {
struct kvec vec[3];
unsigned int check_size_eq:1;
};
static inline void __scoutfs_btree_init_val(struct scoutfs_btree_val *val,

14
kmod/src/dir.c
View File

@@ -654,6 +654,7 @@ static void *scoutfs_follow_link(struct dentry *dentry, struct nameidata *nd)
SCOUTFS_SYMLINK_KEY, k);
bytes = min_t(int, size - off, SCOUTFS_MAX_ITEM_LEN);
scoutfs_btree_init_val(&val, path + off, bytes);
val.check_size_eq = 1;
ret = scoutfs_btree_lookup(sb, meta, &key, &val);
if (ret < 0) {
@@ -663,12 +664,6 @@ static void *scoutfs_follow_link(struct dentry *dentry, struct nameidata *nd)
break;
}
/* XXX corruption */
if (ret != bytes) {
ret = -EIO;
break;
}
off += bytes;
ret = 0;
}
@@ -858,6 +853,7 @@ retry:
scoutfs_set_key(&last, ino, SCOUTFS_LINK_BACKREF_KEY, ~0ULL);
scoutfs_btree_init_val(&val, &lref, sizeof(lref));
val.check_size_eq = 1;
ret = scoutfs_btree_next(sb, meta, &first, &last, &key, &val);
if (ret < 0) {
@@ -866,12 +862,6 @@ retry:
goto out;
}
/* XXX corruption */
if (ret != sizeof(lref)) {
ret = -EIO;
goto out;
}
*dir_ino = le64_to_cpu(lref.ino),
off = le64_to_cpu(lref.offset);
*ctr = scoutfs_key_offset(&key);

14
kmod/src/filerw.c
View File

@@ -223,6 +223,7 @@ int scoutfs_truncate_block_items(struct super_block *sb, u64 ino, u64 size)
trace_printk("iblock %llu i %d\n", iblock, i);
scoutfs_btree_init_val(&val, &bmap, sizeof(bmap));
val.check_size_eq = 1;
for (;;) {
ret = scoutfs_btree_next(sb, meta, &key, &last, &key, &val);
@@ -232,12 +233,6 @@ int scoutfs_truncate_block_items(struct super_block *sb, u64 ino, u64 size)
break;
}
/* XXX corruption */
if (ret != sizeof(bmap)) {
ret = -EIO;
break;
}
/* XXX check bmap sanity */
/* make sure we can update bmap after freeing */
@@ -374,6 +369,7 @@ static int map_writable_block(struct inode *inode, u64 iblock, u64 *blkno_ret)
set_bmap_key(&key, inode, iblock);
scoutfs_btree_init_val(&val, &bmap, sizeof(bmap));
val.check_size_eq = 1;
/* see if there's an existing mapping */
ret = scoutfs_btree_lookup(sb, meta, &key, &val);
@@ -389,12 +385,6 @@ static int map_writable_block(struct inode *inode, u64 iblock, u64 *blkno_ret)
inserted = true;
} else {
/* XXX corruption */
if (ret != sizeof(bmap)) {
ret = -EIO;
goto out;
}
ret = scoutfs_btree_dirty(sb, meta, &key);
if (ret)
goto out;

14
kmod/src/inode.c
View File

@@ -427,16 +427,12 @@ static void delete_inode(struct super_block *sb, u64 ino)
/* sample the inode mode, XXX don't need to copy whole thing here */
scoutfs_set_key(&key, ino, SCOUTFS_INODE_KEY, 0);
scoutfs_btree_init_val(&val, &sinode, sizeof(sinode));
val.check_size_eq = 1;
ret = scoutfs_btree_lookup(sb, meta, &key, &val);
if (ret < 0)
goto out;
/* XXX corruption */
if (ret != sizeof(sinode)) {
ret = -EIO;
goto out;
}
mode = le32_to_cpu(sinode.mode);
ret = __delete_inode(sb, &key, ino, mode);
@@ -486,6 +482,7 @@ static int process_orphaned_inode(struct super_block *sb, u64 ino)
scoutfs_set_key(&key, ino, SCOUTFS_INODE_KEY, 0);
scoutfs_btree_init_val(&val, &sinode, sizeof(sinode));
val.check_size_eq = 1;
ret = scoutfs_btree_lookup(sb, meta, &key, &val);
if (ret < 0) {
@@ -494,18 +491,11 @@ static int process_orphaned_inode(struct super_block *sb, u64 ino)
return ret;
}
/* XXX corruption */
if (ret != sizeof(sinode)) {
ret = -EIO;
goto out;
}
if (le32_to_cpu(sinode.nlink) == 0)
__delete_inode(sb, &key, ino, le32_to_cpu(sinode.mode));
else
scoutfs_warn(sb, "Dangling orphan item for inode %llu.", ino);
out:
return ret;
}

14
kmod/src/xattr.c
View File

@@ -230,6 +230,7 @@ static int insert_xattr(struct inode *inode, const char *name,
/* increment the val hash item for find_xattr, inserting if first */
scoutfs_btree_init_val(&val, &refcount, sizeof(refcount));
val.check_size_eq = 1;
ret = scoutfs_btree_lookup(sb, meta, &val_key, &val);
if (ret < 0 && ret != -ENOENT)
@@ -239,12 +240,6 @@ static int insert_xattr(struct inode *inode, const char *name,
refcount = cpu_to_le64(1);
ret = scoutfs_btree_insert(sb, meta, &val_key, &val);
} else {
/* XXX corruption */
if (ret != sizeof(refcount)) {
ret = -EIO;
goto out;
}
le64_add_cpu(&refcount, 1);
ret = scoutfs_btree_update(sb, meta, &val_key, &val);
}
@@ -277,16 +272,11 @@ static int delete_xattr(struct super_block *sb, struct scoutfs_key *key,
/* update the val_hash refcount, making sure it's not nonsense */
scoutfs_btree_init_val(&val, &refcount, sizeof(refcount));
val.check_size_eq = 1;
ret = scoutfs_btree_lookup(sb, meta, &val_key, &val);
if (ret < 0)
goto out;
/* XXX corruption */
if (ret != sizeof(refcount)) {
ret = -EIO;
goto out;
}
le64_add_cpu(&refcount, -1ULL);
/* ensure that we can update and delete name_ and val_ keys */