From: Colin Ian King <colin.king@canonical.com>
Date: Fri, 16 Dec 2016 13:32:39 +0000 (+0000)
Subject: ubifs: ensure zero err is returned on successful return
X-Git-Tag: android-x86-8.1-r1~4310^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e8f19746e4b1e8c3118d240dba51f06153a37b07;p=android-x86%2Fkernel.git

ubifs: ensure zero err is returned on successful return

err is no longer being set on a successful return path, causing
a garbage value being returned. Fix this by setting err to zero
for the successful return path.

Found with static analysis by CoverityScan, CID 1389473

Fixes: 7799953b34d18 ("ubifs: Implement encrypt/decrypt for all IO")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index a459211a1c21..b75f1a61afe3 100644
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -1319,6 +1319,7 @@ static int truncate_data_node(const struct ubifs_info *c, const struct inode *in
 	dn->compr_type = cpu_to_le16(compr_type);
 	dn->size = cpu_to_le32(*new_len);
 	*new_len = UBIFS_DATA_NODE_SZ + out_len;
+	err = 0;
 out:
 	kfree(buf);
 	return err;