Joseph Qi
2013-Jul-31 09:33 UTC
[Ocfs2-devel] [PATCH] ocfs2: add the missing return value check of ocfs2_xattr_get_clusters
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 at huawei.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)) -- 1.7.9.7
Jeff Liu
2013-Jul-31 09:57 UTC
[Ocfs2-devel] [PATCH] ocfs2: add the missing return value check of ocfs2_xattr_get_clusters
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 at huawei.com>Looks good, thanks! Acked-by: Jie Liu <jeff.liu at 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))