2021-11-05 17:21:26

by Trond Myklebust

Subject: [PATCH] NFS: Don't trace an uninitialised value

From: Trond Myklebust <[email protected]>

If fhandle is NULL or fattr is NULL, then 'error' is uninitialised.

Reported-by: Nathan Chancellor <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/dir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 8de99f426183..731d31015b6a 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1798,7 +1798,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
}
nfs_set_verifier(dentry, dir_verifier);
out:
- trace_nfs_lookup_exit(dir, dentry, flags, error);
+ trace_nfs_lookup_exit(dir, dentry, flags, PTR_ERR_OR_ZERO(res));
nfs_free_fattr(fattr);
nfs_free_fhandle(fhandle);
return res;
--
2.33.1

2021-11-05 17:22:39

by Nathan Chancellor

Subject: Re: [PATCH] NFS: Don't trace an uninitialised value

On Fri, Nov 05, 2021 at 12:38:52PM -0400, [email protected] wrote:
> From: Trond Myklebust <[email protected]>
>
> If fhandle is NULL or fattr is NULL, then 'error' is uninitialised.
>
> Reported-by: Nathan Chancellor <[email protected]>
> Signed-off-by: Trond Myklebust <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> fs/nfs/dir.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index 8de99f426183..731d31015b6a 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -1798,7 +1798,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
> }
> nfs_set_verifier(dentry, dir_verifier);
> out:
> - trace_nfs_lookup_exit(dir, dentry, flags, error);
> + trace_nfs_lookup_exit(dir, dentry, flags, PTR_ERR_OR_ZERO(res));
> nfs_free_fattr(fattr);
> nfs_free_fhandle(fhandle);
> return res;
> --
> 2.33.1
>