diff options
| author | Tiger Yang <tiger.yang@oracle.com> | 2008-11-02 19:04:21 +0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-11-10 09:51:47 -0800 |
| commit | 6c1e183e12dbd78a897a859f13220406296fee31 (patch) | |
| tree | c57a634cae86c83db4e3067af8ccf83805d2bf90 /fs | |
| parent | de29c08528bae45e3fa1171d190f1340e37e0f70 (diff) | |
| download | op-kernel-dev-6c1e183e12dbd78a897a859f13220406296fee31.zip op-kernel-dev-6c1e183e12dbd78a897a859f13220406296fee31.tar.gz | |
ocfs2: Check search result in ocfs2_xattr_block_get()
ocfs2_xattr_block_get() calls ocfs2_xattr_search() to find an external
xattr, but doesn't check the search result that is passed back via struct
ocfs2_xattr_search. Add a check for search result, and pass back -ENODATA if
the xattr search failed. This avoids a later NULL pointer error.
Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/xattr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 70baffeb..054e2ef 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -777,6 +777,11 @@ static int ocfs2_xattr_block_get(struct inode *inode, goto cleanup; } + if (xs->not_found) { + ret = -ENODATA; + goto cleanup; + } + xb = (struct ocfs2_xattr_block *)xs->xattr_bh->b_data; size = le64_to_cpu(xs->here->xe_value_size); if (buffer) { @@ -860,7 +865,7 @@ static int ocfs2_xattr_get(struct inode *inode, down_read(&oi->ip_xattr_sem); ret = ocfs2_xattr_ibody_get(inode, name_index, name, buffer, buffer_size, &xis); - if (ret == -ENODATA) + if (ret == -ENODATA && di->i_xattr_loc) ret = ocfs2_xattr_block_get(inode, name_index, name, buffer, buffer_size, &xbs); up_read(&oi->ip_xattr_sem); |
