ubifs: Fix error return code in ubifs_init_authentication()
authorWang ShaoBo <bobo.shaobowang@huawei.com>
Tue, 24 Nov 2020 06:33:20 +0000 (14:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:53:52 +0000 (11:53 +0100)
[ 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>
fs/ubifs/auth.c

index b93b3cd10bfd3254838f9efb8ae9a9497a37278b..8c50de693e1d4f23cc7d9acfbbfd7ec2e262e53b 100644 (file)
@@ -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;