mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ocfs2: fix possible uninitialized variable access

Browse source 
In ocfs2_local_alloc_find_clear_bits and ocfs2_get_dentry, variable
numfound and set may be uninitialized and then used in tracepoint.  In
ocfs2_xattr_block_get and ocfs2_delete_xattr_in_bucket, variable block_off
and xv may be uninitialized and then used in the following logic due to
unchecked return value.

This patch fixes these possible issues.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joseph Qi 2015-04-14 15:43:33 -07:00 committed by Linus Torvalds
parent 7c01ad8fe7
commit 023d4ea358
3 changed files with 10 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ocfs2/export.c
View file

@ -82,7 +82,6 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb,
} }
status = ocfs2_test_inode_bit(osb, blkno, &set); status = ocfs2_test_inode_bit(osb, blkno, &set);
trace_ocfs2_get_dentry_test_bit(status, set);
if (status < 0) { if (status < 0) {
if (status == -EINVAL) { if (status == -EINVAL) {
/* /*
@ -96,6 +95,7 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb,
goto unlock_nfs_sync; goto unlock_nfs_sync;
} }
trace_ocfs2_get_dentry_test_bit(status, set);
/* If the inode allocator bit is clear, this inode must be stale */ /* If the inode allocator bit is clear, this inode must be stale */
if (!set) { if (!set) {
status = -ESTALE; status = -ESTALE;

2
fs/ocfs2/localalloc.c
View file

@ -839,7 +839,7 @@ static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb,
u32 *numbits, u32 *numbits,
struct ocfs2_alloc_reservation *resv) struct ocfs2_alloc_reservation *resv)
{ {
int numfound, bitoff, left, startoff, lastzero; int numfound = 0, bitoff, left, startoff, lastzero;
int local_resv = 0; int local_resv = 0;
struct ocfs2_alloc_reservation r; struct ocfs2_alloc_reservation r;
void *bitmap = NULL; void *bitmap = NULL;

8
fs/ocfs2/xattr.c
View file

@ -1238,6 +1238,10 @@ static int ocfs2_xattr_block_get(struct inode *inode,
i, i,
&block_off, &block_off,
&name_offset); &name_offset);
if (ret) {
mlog_errno(ret);
goto cleanup;
}
xs->base = bucket_block(xs->bucket, block_off); xs->base = bucket_block(xs->bucket, block_off);
} }
if (ocfs2_xattr_is_local(xs->here)) { if (ocfs2_xattr_is_local(xs->here)) {
@ -5665,6 +5669,10 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
ret = ocfs2_get_xattr_tree_value_root(inode->i_sb, bucket, ret = ocfs2_get_xattr_tree_value_root(inode->i_sb, bucket,
i, &xv, NULL); i, &xv, NULL);
if (ret) {
mlog_errno(ret);
break;
}
ret = ocfs2_lock_xattr_remove_allocators(inode, xv, ret = ocfs2_lock_xattr_remove_allocators(inode, xv,
args->ref_ci, args->ref_ci,