diff mbox

[next] ubifs: fix uninitialized error variable err

Message ID 20170717160001.20285-1-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King July 17, 2017, 4 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Variable err is not initialized and so the check to see if it is
non-zero is basically checking a random garbage value. Fix this
by initializing err to zero.

Detected by CoverityScan, CID#1451370 ("Uninitialized variable")

Fixes: 781f675e2d7e ("ubifs: Fix unlink code wrt. double hash lookups")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 fs/ubifs/tnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Weinberger July 17, 2017, 4:03 p.m. UTC | #1 
Colin,

Am 17.07.2017 um 18:00 schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Variable err is not initialized and so the check to see if it is
> non-zero is basically checking a random garbage value. Fix this
> by initializing err to zero.
> 
> Detected by CoverityScan, CID#1451370 ("Uninitialized variable")
> 
> Fixes: 781f675e2d7e ("ubifs: Fix unlink code wrt. double hash lookups")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Thanks, geert already pointed out that I've merged a bad patch.
I managed to merge the patch without the issues fixed that Hyunchul Lee
identified. ;-(

Thanks,
//richard
diff mbox

Patch

diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 0a213dcba2a1..ec18304fe0e1 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -1884,7 +1884,7 @@  static int search_dh_cookie(struct ubifs_info *c, const union ubifs_key *key,
 			    struct ubifs_dent_node *dent, uint32_t cookie,
 			    struct ubifs_znode **zn, int *n)
 {
-	int err;
+	int err = 0;
 	struct ubifs_znode *znode = *zn;
 	struct ubifs_zbranch *zbr;
 	union ubifs_key *dkey;