summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-12-16 14:32:39 +0100
committerRichard Weinberger <richard@nod.at>2017-01-17 13:57:32 +0100
commite8f19746e4b1e8c3118d240dba51f06153a37b07 (patch)
tree4917e9ccaf6e632bbb63b0048973df8b57edd301 /fs/ubifs
parentMerge tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff)
downloadlinux-e8f19746e4b1e8c3118d240dba51f06153a37b07.tar.xz
linux-e8f19746e4b1e8c3118d240dba51f06153a37b07.zip
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>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/journal.c1
1 files changed, 1 insertions, 0 deletions
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;