2021-06-01 11:08:54

by Jiapeng Chong

Subject: [PATCH] fs/jfs: Fix missing error code in lmLogInit()

The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'rc.

Eliminate the follow smatch warning:

fs/jfs/jfs_logmgr.c:1327 lmLogInit() warn: missing error code 'rc'.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
fs/jfs/jfs_logmgr.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 9330eff21..78fd136 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1324,6 +1324,7 @@ int lmLogInit(struct jfs_log * log)
} else {
if (!uuid_equal(&logsuper->uuid, &log->uuid)) {
jfs_warn("wrong uuid on JFS log device");
+ rc = -EINVAL;
goto errout20;
}
log->size = le32_to_cpu(logsuper->size);
--
1.8.3.1

2021-06-01 15:32:53

by Dave Kleikamp

Subject: Re: [PATCH] fs/jfs: Fix missing error code in lmLogInit()

Good catch. I'll push this in the next merge window.

Thanks,
Shaggy

On 6/1/21 6:07 AM, Jiapeng Chong wrote:
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'rc.
>
> Eliminate the follow smatch warning:
>
> fs/jfs/jfs_logmgr.c:1327 lmLogInit() warn: missing error code 'rc'.
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> fs/jfs/jfs_logmgr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
> index 9330eff21..78fd136 100644
> --- a/fs/jfs/jfs_logmgr.c
> +++ b/fs/jfs/jfs_logmgr.c
> @@ -1324,6 +1324,7 @@ int lmLogInit(struct jfs_log * log)
> } else {
> if (!uuid_equal(&logsuper->uuid, &log->uuid)) {
> jfs_warn("wrong uuid on JFS log device");
> + rc = -EINVAL;
> goto errout20;
> }
> log->size = le32_to_cpu(logsuper->size);
>