| Message ID | 20201124063320.1799-1-bobo.shaobowang@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ubifs: Fix error return code in ubifs_init_authentication() | expand |
On Tue, Nov 24, 2020 at 02:33:20PM +0800, Wang ShaoBo wrote: > 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> > --- > fs/ubifs/auth.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Sascha > > 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; > > -- > 2.17.1 > >
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;
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> --- fs/ubifs/auth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)