Thread (3 messages) 3 messages, 3 authors, 2023-01-12

Re: [PATCH] NFSD: fix use-after-free in nfsd4_ssc_setup_dul()

From: Jeff Layton <jlayton@kernel.org>
Date: 2023-01-11 16:32:16

On Thu, 2023-01-12 at 00:24 +0800, Xingyuan Mo wrote:
quoted hunk ↗ jump to hunk
If signal_pending() returns true, schedule_timeout() will not be executed,
causing the waiting task to remain in the wait queue.
Fixed by adding a call to finish_wait(), which ensures that the waiting
task will always be removed from the wait queue.

Reported-by: Xingyuan Mo <redacted>
Signed-off-by: Xingyuan Mo <redacted>
---
 fs/nfsd/nfs4proc.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index bd880d55f565..3fa819e29b3f 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1318,6 +1318,7 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,
 			/* allow 20secs for mount/unmount for now - revisit */
 			if (signal_pending(current) ||
 					(schedule_timeout(20*HZ) == 0)) {
+				finish_wait(&nn->nfsd_ssc_waitq, &wait);
 				kfree(work);
 				return nfserr_eagain;
 			}
Nice catch.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help