summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorWang ShaoBo <bobo.shaobowang@huawei.com>2020-11-24 09:33:20 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 13:53:52 +0300
commit0cc9725e4b25292b838cc7c3d16dc9520b184926 (patch)
tree8a04e8fff7ea173e3001c93405ee0a57b29ba315 /fs
parent9dc1b44d4f968f1d0df383b1f08a2c58076de9fa (diff)
downloadlinux-0cc9725e4b25292b838cc7c3d16dc9520b184926.tar.xz
ubifs: Fix error return code in ubifs_init_authentication()
[ Upstream commit 3cded66330591cfd2554a3fd5edca8859ea365a2 ] Fix to return PTR_ERR() error code from the error handling case where ubifs_hash_get_desc() failed instead of 0 in ubifs_init_authentication(), as done elsewhere in this function. Fixes: 49525e5eecca5 ("ubifs: Add helper functions for authentication support") Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com> Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/auth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ubifs/auth.c b/fs/ubifs/auth.c
index b93b3cd10bfd..8c50de693e1d 100644
--- a/fs/ubifs/auth.c
+++ b/fs/ubifs/auth.c
@@ -338,8 +338,10 @@ int ubifs_init_authentication(struct ubifs_info *c)
c->authenticated = true;
c->log_hash = ubifs_hash_get_desc(c);
- if (IS_ERR(c->log_hash))
+ if (IS_ERR(c->log_hash)) {
+ err = PTR_ERR(c->log_hash);
goto out_free_hmac;
+ }
err = 0;