diff mbox

ocfs2: add the missing return value check of ocfs2_xattr_get_clusters

Message ID 51F8D9EB.9060607@huawei.com
State New, archived
Headers show

Commit Message

Joseph Qi July 31, 2013, 9:33 a.m. UTC
In ocfs2_xattr_value_attach_refcount(), if error occurs when calling
ocfs2_xattr_get_clusters(), it will go with unexpected behavior since
local variables p_cluster, num_clusters and ext_flags are declared
without initialization.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
---
 fs/ocfs2/xattr.c |    4 ++++
 1 file changed, 4 insertions(+)

Comments

jeff.liu July 31, 2013, 9:57 a.m. UTC | #1
On 07/31/2013 05:33 PM, Joseph Qi wrote:

> In ocfs2_xattr_value_attach_refcount(), if error occurs when calling
> ocfs2_xattr_get_clusters(), it will go with unexpected behavior since
> local variables p_cluster, num_clusters and ext_flags are declared
> without initialization.
> 
> Signed-off-by: Joseph Qi <joseph.qi@huawei.com>

Looks good, thanks!
Acked-by: Jie Liu <jeff.liu@oracle.com>

> ---
>  fs/ocfs2/xattr.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
> index 2e3ea30..87daa44 100644
> --- a/fs/ocfs2/xattr.c
> +++ b/fs/ocfs2/xattr.c
> @@ -5889,6 +5889,10 @@ static int ocfs2_xattr_value_attach_refcount(struct inode *inode,
>  	while (cpos < clusters) {
>  		ret = ocfs2_xattr_get_clusters(inode, cpos, &p_cluster,
>  					       &num_clusters, el, &ext_flags);
> +		if (ret) {
> +			mlog_errno(ret);
> +			break;
> +		}
>  
>  		cpos += num_clusters;
>  		if ((ext_flags & OCFS2_EXT_REFCOUNTED))
diff mbox

Patch

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 2e3ea30..87daa44 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -5889,6 +5889,10 @@  static int ocfs2_xattr_value_attach_refcount(struct inode *inode,
 	while (cpos < clusters) {
 		ret = ocfs2_xattr_get_clusters(inode, cpos, &p_cluster,
 					       &num_clusters, el, &ext_flags);
+		if (ret) {
+			mlog_errno(ret);
+			break;
+		}
 
 		cpos += num_clusters;
 		if ((ext_flags & OCFS2_EXT_REFCOUNTED))