| From a889044dff09fd820e35daf23e501ad21087ab35 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 9 Apr 2021 10:27:34 -0700 |
| Subject: xfs: fix return of uninitialized value in variable error |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ 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> |
| --- |
| fs/xfs/libxfs/xfs_attr.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| 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; |
| -- |
| 2.30.2 |
| |