Messages in this thread | | | From | Chuck Lever <> | Subject | Re: [PATCH][next] nfsd: fix check of statid returned from call to find_stateid_by_type | Date | Thu, 28 Jan 2021 15:05:06 +0000 |
| |
Hi Colin-
> On Jan 28, 2021, at 9:49 AM, Colin King <colin.king@canonical.com> wrote: > > From: Colin Ian King <colin.king@canonical.com> > > The call to find_stateid_by_type is setting the return value in *stid > yet the NULL check of the return is checking stid instead of *stid. > Fix this by adding in the missing pointer * operator. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 6cdaa72d4dde ("nfsd: find_cpntf_state cleanup") > Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks for your patch. I've committed it to the for-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
in preparation for the v5.12 merge window, with the following changes:
- ^statid^stateid - Fixes: tag removed, since no stable backport is necessary
The commit you are fixing has not been merged upstream yet.
> --- > fs/nfsd/nfs4state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index f554e3480bb1..423fd6683f3a 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -5824,7 +5824,7 @@ static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st, > > *stid = find_stateid_by_type(found, &cps->cp_p_stateid, > NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID); > - if (stid) > + if (*stid) > status = nfs_ok; > else > status = nfserr_bad_stateid; > -- > 2.29.2 >
-- Chuck Lever
| |