NFS: Beware when dereferencing the delegation cred
Subsystems (2)
[email protected]
maintainerPATCH 1/3 NFS: Beware when dereferencing the delegation cred
From: Trond Myklebust <[email protected]>
When we look up the delegation cred, we are usually doing so in conjunction with a read of the stateid, and we want to ensure that the look up is atomic with that read.
Fixes 5f4adff16fa2 ("NFSv4: nfs_update_inplace_delegation() should update delegation cred")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/delegation.c | 9 ++++++++- fs/nfs/nfs4proc.c | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-)
fs/nfs/delegation.c +8 -1
@@ -1243,8 +1243,10 @@ static int nfs_server_reap_expired_delegations(struct nfs_server *server, inode =nfs_delegation_grab_inode (delegation);if (inode ==NULL ) goto restart_locked; +spin_lock (&delegation->lock); cred =get_cred_rcu (delegation->cred);nfs4_stateid_copy (&stateid, &delegation->stateid); +spin_unlock (&delegation->lock);clear_bit (NFS_DELEGATION_TEST_EXPIRED , &delegation->flags);rcu_read_unlock ();nfs_delegation_test_free_expired (inode, &stateid, cred);
@@ -1363,11 +1365,14 @@ bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags, {struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation; -bool ret; +bool ret = false; flags &=FMODE_READ |FMODE_WRITE ;rcu_read_lock (); delegation =rcu_dereference (nfsi->delegation); +if (!delegation) + goto out; +spin_lock (&delegation->lock); ret =nfs4_is_valid_delegation (delegation, flags);if (ret) {nfs4_stateid_copy (dst, &delegation->stateid);
@@ -1375,6 +1380,8 @@ bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags,if (cred) *cred =get_cred (delegation->cred); } +spin_unlock (&delegation->lock); +out:rcu_read_unlock ();return ret; }
fs/nfs/nfs4proc.c +3 -0
@@ -2790,16 +2790,19 @@ static int nfs41_check_delegation_stateid(struct nfs4_state *state)return NFS_OK ; } +spin_lock (&delegation->lock);nfs4_stateid_copy (&stateid, &delegation->stateid);if (!test_and_clear_bit (NFS_DELEGATION_TEST_EXPIRED , &delegation->flags)) { +spin_unlock (&delegation->lock);rcu_read_unlock ();return NFS_OK ; }if (delegation->cred) cred =get_cred (delegation->cred); +spin_unlock (&delegation->lock);rcu_read_unlock (); status =nfs41_test_and_free_expired_stateid (server, &stateid, cred);trace_nfs4_test_delegation_stateid (state,NULL , status);
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH 2/3 NFS/pnfs: Fix dereference of layout cred in pnfs_layoutcommit_inode()
From: Trond Myklebust <[email protected]>
Ensure that the dereference of the layout cred is atomic with the stateid.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs.c +1 -1
@@ -3137,10 +3137,10 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) end_pos = nfsi->layout->plh_lwb;nfs4_stateid_copy (&data->args.stateid, &nfsi->layout->plh_stateid); + data->cred =get_cred (nfsi->layout->plh_lc_cred);spin_unlock (&inode->i_lock); data->args.inode = inode; - data->cred =get_cred (nfsi->layout->plh_lc_cred);nfs_fattr_init (&data->fattr); data->args.bitmask =NFS_SERVER (inode)->cache_consistency_bitmask; data->res.fattr = &data->fattr;
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH 3/3 NFS/pnfs: Reference the layout cred in pnfs_prepare_layoutreturn()
From: Trond Myklebust <[email protected]>
When we're sending a layoutreturn, ensure that we reference the layout cred atomically with the copy of the stateid.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs4proc.c | 1 + fs/nfs/pnfs.c | 52 ++++++++++++++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 19 deletions(-)
fs/nfs/nfs4proc.c +1 -0
@@ -9297,6 +9297,7 @@ static void nfs4_layoutreturn_release(void *calldata) lrp->ld_private.ops->free (&lrp->ld_private);pnfs_put_layout_hdr (lrp->args.layout);nfs_iput_and_deactive (lrp->inode); +put_cred (lrp->cred);kfree (calldata);dprintk ("<-- %s\n" , __func__); }
fs/nfs/pnfs.c +33 -19
157 lines not on this page · raw message
Signature · 1 line
2.25.1