NFS: Pin the 'struct nfs_server' during a FREE_STATEID call
Subsystems (2)
Anna Schumaker
maintainerPATCH 1/2 NFS: Pin the 'struct nfs_server' during a FREE_STATEID call
From: Anna Schumaker <[email protected]>
Dan Aloni reports that he was able to hit a use-after-free bug if a FREE_STATEID operation gets delayed for whatever reason. Fix this by bumping the refcount of the 'struct nfs_server' object for the duration of the FREE_STATEID so it doesn't get cleaned up from underneath us while operations are still in flight.
--- fs/nfs/nfs4proc.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/nfs/nfs4proc.c +5 -0
@@ -10364,6 +10364,7 @@ static void nfs41_free_stateid_release(void *calldata)struct nfs_free_stateid_data *data = calldata;struct nfs_client *clp = data->server->nfs_client; +nfs_sb_deactive (data->server->super);nfs_put_client (clp);kfree (calldata); }
@@ -10405,6 +10406,10 @@ static int nfs41_free_stateid(struct nfs_server *server,if (!refcount_inc_not_zero (&clp->cl_count))return -EIO ; +if (!nfs_sb_active (server->super)) { +nfs_put_client (clp); +return -EIO ; + }nfs4_state_protect (clp,NFS_SP4_MACH_CRED_STATEID , &task_setup.rpc_client, &msg);
Signature · 1 line
2.55.0
Anna Schumaker
maintainerPATCH 2/2 NFS: Decrement refcounts if allocating nfs_free_stateid_data fails
From: Anna Schumaker <[email protected]>
I noticed that we were immediately exiting this function if the allocation fails, leaving the client and server object refcounts bumped. Fix this by creating a common exit point to clean up dangling references.
--- fs/nfs/nfs4proc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
fs/nfs/nfs4proc.c +13 -7
@@ -10403,21 +10403,22 @@ static int nfs41_free_stateid(struct nfs_server *server,struct nfs_free_stateid_data *data;struct rpc_task *task;struct nfs_client *clp = server->nfs_client; +int ret = -EIO ;if (!refcount_inc_not_zero (&clp->cl_count)) -return -EIO ; -if (!nfs_sb_active (server->super)) { -nfs_put_client (clp); -return -EIO ; - } +return ret; +if (!nfs_sb_active (server->super)) + goto out_put_clp;nfs4_state_protect (clp,NFS_SP4_MACH_CRED_STATEID , &task_setup.rpc_client, &msg);dprintk ("NFS call free_stateid %p\n" , stateid); data =kmalloc_obj (*data); -if (!data) -return -ENOMEM ; +if (!data) { + ret = -ENOMEM ; + goto out_put_server; + } data->server = server;nfs4_stateid_copy (&data->args.stateid, stateid);
@@ -10433,6 +10434,11 @@ static int nfs41_free_stateid(struct nfs_server *server,rpc_put_task (task); stateid->type =NFS4_FREED_STATEID_TYPE ;return 0 ; +out_put_server: +nfs_sb_deactive (server->super); +out_put_clp: +nfs_put_client (clp); +return ret; } static void
Signature · 1 line
2.55.0
Hi Anna,
Quoted 5 lines · Anna Schumaker
Dan Aloni reports that he was able to hit a use-after-free bug if a
FREE_STATEIDoperation gets delayed for whatever reason. Fix this by bumping the refcount of the 'structnfs_server' object for the duration of theFREE_STATEIDso it doesn't get cleaned up from underneath us while operations are still in flight.
This patch reminded me of a similar nfs_server use-after-free that we recently encountered in production. However, it appears to involve a different race and root cause:
NFSv4: pin the superblock for active state owners
https://lore.kernel.org/all/[email protected]/
Would you mind taking a look at it and letting me know if the approach looks reasonable?
Thanks,
Jia