Skip to contentSkip to conversation

NFSD: fix problems with cleanup on errors in nfsd4_copy

PATCH Superseded Dai Ngo 2 participants 4 messages Jan 24, 2023

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Dai Ngo

author reviewer
#0 lore raw

PATCH 1/1 NFSD: fix problems with cleanup on errors in nfsd4_copy

When nfsd4_copy fails to allocate memory for async_copy->cp_src, or nfs4_init_copy_state fails, it calls cleanup_async_copy to do the cleanup for the async_copy which causes page fault since async_copy is not yet initialized.

This patche sets async_copy to NULL to skip cleanup_async_copy if async_copy is not yet initialized.

Fixes ce0887ac96d3 ("NFSD add nfs4 inter ssc to nfsd4_copy")
Fixes 87689df69491 ("NFSD: Shrink size of struct nfsd4_copy")
---
 fs/nfsd/nfs4proc.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
fs/nfsd/nfs4proc.c +10 -3
index 3b73e4d342bf..b4e7e18e1761 100644
@@ -1688,7 +1688,8 @@ static void cleanup_async_copy(struct nfsd4_copy *copy)
 	if (!nfsd4_ssc_is_inter(copy))
 		nfsd_file_put(copy->nf_src);
 	spin_lock(&copy->cp_clp->async_lock);
-	list_del(&copy->copies);
+	if (!list_empty(&copy->copies))
+		list_del(&copy->copies);
 	spin_unlock(&copy->cp_clp->async_lock);
 	nfs4_put_copy(copy);
 }
@@ -1789,9 +1790,15 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 			goto out_err;
 		async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
 		if (!async_copy->cp_src)
+			goto no_mem;
+		if (!nfs4_init_copy_state(nn, copy)) {
+			kfree(async_copy->cp_src);
+no_mem:
+			kfree(async_copy);
+			async_copy = NULL;
 			goto out_err;
-		if (!nfs4_init_copy_state(nn, copy))
-			goto out_err;
+		}
+		INIT_LIST_HEAD(&async_copy->copies);
 		refcount_set(&async_copy->refcount, 1);
 		memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid.cs_stid,
 			sizeof(copy->cp_res.cb_stateid));
Signature · 1 line
2.9.5
maintainer
#1 lore raw
Quoted 30 lines · Dai Ngo

When nfsd4_copy fails to allocate memory for async_copy->cp_src, or nfs4_init_copy_state fails, it calls cleanup_async_copy to do the cleanup for the async_copy which causes page fault since async_copy is not yet initialized.

This patche sets async_copy to NULL to skip cleanup_async_copy if async_copy is not yet initialized.

Fixes ce0887ac96d3 ("NFSD add nfs4 inter ssc to nfsd4_copy")
Fixes 87689df69491 ("NFSD: Shrink size of struct nfsd4_copy")
---
 fs/nfsd/nfs4proc.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
fs/nfsd/nfs4proc.c +2 -1
index 3b73e4d342bf..b4e7e18e1761 100644
@@ -1688,7 +1688,8 @@ static void cleanup_async_copy(struct nfsd4_copy *copy)
 	if (!nfsd4_ssc_is_inter(copy))
 		nfsd_file_put(copy->nf_src);
 	spin_lock(&copy->cp_clp->async_lock);
-	list_del(&copy->copies);
+	if (!list_empty(&copy->copies))
+		list_del(&copy->copies);
 	spin_unlock(&copy->cp_clp->async_lock);
 	nfs4_put_copy(copy);
 }

fs/nfsd/nfs4proc.c nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, · line 1798

Quoted 9 lines
fs/nfsd/nfs4proc.c +6 -0
@@ -1789,9 +1790,15 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 			goto out_err;
 		async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
 		if (!async_copy->cp_src)
+			goto no_mem;
+		if (!nfs4_init_copy_state(nn, copy)) {
+			kfree(async_copy->cp_src);
+no_mem:
+			kfree(async_copy);
+			async_copy = NULL;

This seems pretty fragile and the result begins to resemble spaghetti. I think it'd be cleaner to initialize the list_head and refcount before you do the allocation of cp_src. Then you can just call cleanup_async_copy no matter where it fails.

Bear in mind that these are failure codepaths, so we don't need to optimize for performance here.

Quoted 8 lines
fs/nfsd/nfs4proc.c +2 -2
 			goto out_err;
-		if (!nfs4_init_copy_state(nn, copy))
-			goto out_err;
+		}
+		INIT_LIST_HEAD(&async_copy->copies);
 		refcount_set(&async_copy->refcount, 1);
 		memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid.cs_stid,
 			sizeof(copy->cp_res.cb_stateid));
Signature · 1 line
Jeff Layton <[email protected]>
author reviewer
#2 lore raw
Quoted 36 lines · Jeff Layton
Quoted 35 lines · Dai Ngo

When nfsd4_copy fails to allocate memory for async_copy->cp_src, or nfs4_init_copy_state fails, it calls cleanup_async_copy to do the cleanup for the async_copy which causes page fault since async_copy is not yet initialized.

This patche sets async_copy to NULL to skip cleanup_async_copy if async_copy is not yet initialized.

Fixes ce0887ac96d3 ("NFSD add nfs4 inter ssc to nfsd4_copy")
Fixes 87689df69491 ("NFSD: Shrink size of struct nfsd4_copy")
---
  fs/nfsd/nfs4proc.c | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
fs/nfsd/nfs4proc.c +4 -1
index 3b73e4d342bf..b4e7e18e1761 100644
@@ -1688,7 +1688,8 @@ static void cleanup_async_copy(struct nfsd4_copy *copy)
  	if (!nfsd4_ssc_is_inter(copy))
  		nfsd_file_put(copy->nf_src);
  	spin_lock(&copy->cp_clp->async_lock);
-	list_del(&copy->copies);
+	if (!list_empty(&copy->copies))
+		list_del(&copy->copies);
  	spin_unlock(&copy->cp_clp->async_lock);
  	nfs4_put_copy(copy);
  }
@@ -1789,9 +1790,15 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
  			goto out_err;
  		async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
  		if (!async_copy->cp_src)
+			goto no_mem;
+		if (!nfs4_init_copy_state(nn, copy)) {
Quoted 8 lines

fs/nfsd/nfs4proc.c nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, · line 1798

Quoted 4 lines
fs/nfsd/nfs4proc.c +4 -0
+			kfree(async_copy->cp_src);
+no_mem:
+			kfree(async_copy);
+			async_copy = NULL;

This seems pretty fragile and the result begins to resemble spaghetti. I think it'd be cleaner to initialize the list_head and refcount before you do the allocation of cp_src. Then you can just call cleanup_async_copy no matter where it fails.

If we initialize the list_head and refcount before doing the allocation of cp_src, we still can not call cleanup_async_copy if the allocation of cp_src fails or nfs4_init_copy_state fails since:

. dst->cp_stateid is not initialized
. dst->nf_dst has not been incremented
. dst->ss_nsui is not set

The fields above are initialized by dup_copy_fields and we can not call dup_copy_fields if allocation of cp_src fails or nfs4_init_copy_state fails.

-Dai

Quoted 14 lines

Bear in mind that these are failure codepaths, so we don't need to optimize for performance here.

Quoted 8 lines
fs/nfsd/nfs4proc.c +2 -2
  			goto out_err;
-		if (!nfs4_init_copy_state(nn, copy))
-			goto out_err;
+		}
+		INIT_LIST_HEAD(&async_copy->copies);
  		refcount_set(&async_copy->refcount, 1);
  		memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid.cs_stid,
  			sizeof(copy->cp_res.cb_stateid));
maintainer
#3 lore raw
Quoted 50 lines · On Tue, 2023-01-24 at 12:10 -0800, [email protected] wrote:
Quoted 36 lines · Jeff Layton
Quoted 35 lines · Dai Ngo

When nfsd4_copy fails to allocate memory for async_copy->cp_src, or nfs4_init_copy_state fails, it calls cleanup_async_copy to do the cleanup for the async_copy which causes page fault since async_copy is not yet initialized.

This patche sets async_copy to NULL to skip cleanup_async_copy if async_copy is not yet initialized.

Fixes ce0887ac96d3 ("NFSD add nfs4 inter ssc to nfsd4_copy")
Fixes 87689df69491 ("NFSD: Shrink size of struct nfsd4_copy")
---
  fs/nfsd/nfs4proc.c | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
fs/nfsd/nfs4proc.c +4 -1
index 3b73e4d342bf..b4e7e18e1761 100644
@@ -1688,7 +1688,8 @@ static void cleanup_async_copy(struct nfsd4_copy *copy)
  	if (!nfsd4_ssc_is_inter(copy))
  		nfsd_file_put(copy->nf_src);
  	spin_lock(&copy->cp_clp->async_lock);
-	list_del(&copy->copies);
+	if (!list_empty(&copy->copies))
+		list_del(&copy->copies);
  	spin_unlock(&copy->cp_clp->async_lock);
  	nfs4_put_copy(copy);
  }
@@ -1789,9 +1790,15 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
  			goto out_err;
  		async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
  		if (!async_copy->cp_src)
+			goto no_mem;
+		if (!nfs4_init_copy_state(nn, copy)) {
Quoted 8 lines

fs/nfsd/nfs4proc.c nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, · line 1798

Quoted 4 lines
fs/nfsd/nfs4proc.c +4 -0
+			kfree(async_copy->cp_src);
+no_mem:
+			kfree(async_copy);
+			async_copy = NULL;

This seems pretty fragile and the result begins to resemble spaghetti. I think it'd be cleaner to initialize the list_head and refcount before you do the allocation of cp_src. Then you can just call cleanup_async_copy no matter where it fails.

If we initialize the list_head and refcount before doing the allocation of cp_src, we still can not call cleanup_async_copy if the allocation of cp_src fails or nfs4_init_copy_state fails since:

Quoted 9 lines

. dst->cp_stateid is not initialized
. dst->nf_dst has not been incremented
. dst->ss_nsui is not set

The fields above are initialized by dup_copy_fields and we can not call dup_copy_fields if allocation of cp_src fails or nfs4_init_copy_state fails.

That's what I meant by "fragile". It would be nice if the structure were properly initialized after allocation, so we didn't have to call *just* the right teardown procedure. It's slightly more work to do it that way, but I doubt that would show up in any benchmarks.

I worry that later changes to this code might introduce subtle bugs because of these fields not being fully initialized. This code is very complex, and I think some defensive coding is warranted here.

Quoted 14 lines
Quoted 14 lines

Bear in mind that these are failure codepaths, so we don't need to optimize for performance here.

Quoted 8 lines
fs/nfsd/nfs4proc.c +2 -2
  			goto out_err;
-		if (!nfs4_init_copy_state(nn, copy))
-			goto out_err;
+		}
+		INIT_LIST_HEAD(&async_copy->copies);
  		refcount_set(&async_copy->refcount, 1);
  		memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid.cs_stid,
  			sizeof(copy->cp_res.cb_stateid));
Signature · 1 line
Jeff Layton <[email protected]>