summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2021-04-09 10:27:34 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-14 09:50:34 +0200
commit80cff3e1167021d5c5d821ef267b7b79eeec8865 (patch)
treea67808ecaad1f701fcfc9d947075b25249419fb0
parentb07520a55f10a226a03341e56b781ec8b9543b49 (diff)
downloadlinux-stable-80cff3e1167021d5c5d821ef267b7b79eeec8865.tar.gz
linux-stable-80cff3e1167021d5c5d821ef267b7b79eeec8865.tar.bz2
linux-stable-80cff3e1167021d5c5d821ef267b7b79eeec8865.zip
xfs: fix return of uninitialized value in variable error
[ Upstream commit 3b6dd9a9aeeada19d0c820ff68e979243a888bb6 ] A previous commit removed a call to xfs_attr3_leaf_read that assigned an error return code to variable error. We now have a few early error return paths to label 'out' that return error if error is set; however error now is uninitialized so potentially garbage is being returned. Fix this by setting error to zero to restore the original behaviour where error was zero at the label 'restart'. Addresses-Coverity: ("Uninitialized scalar variable") Fixes: 07120f1abdff ("xfs: Add xfs_has_attr and subroutines") Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/xfs/libxfs/xfs_attr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index fd8e6418a0d3..96ac7e562b87 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -928,6 +928,7 @@ restart:
* Search to see if name already exists, and get back a pointer
* to where it should go.
*/
+ error = 0;
retval = xfs_attr_node_hasname(args, &state);
if (retval != -ENOATTR && retval != -EEXIST)
goto out;