Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Scott Mayhew <smayhew@redhat.com>
To:     bfields@fieldses.org, chuck.lever@oracle.com
Cc:     jamie@audible.transient.net, linux-nfs@vger.kernel.org
Subject: [PATCH v3] nfsd: Fix cld_net->cn_tfm initialization
Date:   Tue, 12 Nov 2019 14:01:43 -0500
Message-Id: <20191112190143.12624-1-smayhew@redhat.com>
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk

Don't assign an error pointer to cld_net->cn_tfm, otherwise an oops will
occur in nfsd4_remove_cld_pipe().

Also, move the initialization of cld_net->cn_tfm so that it occurs after
the check to see if nfsdcld is running.  This is necessary because
nfsd4_client_tracking_init() looks for -ETIMEDOUT to determine whether
to use the "old" nfsdcld tracking ops.

Fixes: 6ee95d1c8991 ("nfsd: add support for upcall version 2")
Reported-by: Jamie Heilman <jamie@audible.transient.net>
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 fs/nfsd/nfs4recover.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index cdc75ad4438b..c35c0ebaf722 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1578,6 +1578,7 @@ nfsd4_cld_tracking_init(struct net *net)
 =09struct nfsd_net *nn =3D net_generic(net, nfsd_net_id);
 =09bool running;
 =09int retries =3D 10;
+=09struct crypto_shash *tfm;
=20
 =09status =3D nfs4_cld_state_init(net);
 =09if (status)
@@ -1586,11 +1587,6 @@ nfsd4_cld_tracking_init(struct net *net)
 =09status =3D __nfsd4_init_cld_pipe(net);
 =09if (status)
 =09=09goto err_shutdown;
-=09nn->cld_net->cn_tfm =3D crypto_alloc_shash("sha256", 0, 0);
-=09if (IS_ERR(nn->cld_net->cn_tfm)) {
-=09=09status =3D PTR_ERR(nn->cld_net->cn_tfm);
-=09=09goto err_remove;
-=09}
=20
 =09/*
 =09 * rpc pipe upcalls take 30 seconds to time out, so we don't want to
@@ -1607,6 +1603,12 @@ nfsd4_cld_tracking_init(struct net *net)
 =09=09status =3D -ETIMEDOUT;
 =09=09goto err_remove;
 =09}
+=09tfm =3D crypto_alloc_shash("sha256", 0, 0);
+=09if (IS_ERR(tfm)) {
+=09=09status =3D PTR_ERR(tfm);
+=09=09goto err_remove;
+=09}
+=09nn->cld_net->cn_tfm =3D tfm;
=20
 =09status =3D nfsd4_cld_get_version(nn);
 =09if (status =3D=3D -EOPNOTSUPP)
--=20
2.17.2