Skip to contentSkip to conversation

nfsd: fix wrong check in write_v4_end_grace()

PATCH Applied Yihao Wu 2 participants 2 messages Mar 6, 2019

Subsystems (3)
lore
Share & tools
lore

Yihao Wu

author
#0 lore raw

PATCH 1/1 nfsd: fix wrong check in write_v4_end_grace()

From 04ddefd79a5cd410d65b7a30593ac915b9fab687 Mon Sep 17 00:00:00 2001
From: Yihao Wu <[email protected]>
Date: Wed, 6 Mar 2019 21:03:50 +0800
Subject: [PATCH] nfsd: fix wrong check in write_v4_end_grace()

Commit 62a063b8e7d1 "nfsd4: fix crash on writing v4_end_grace before nfsd startup" is trying to fix a NULL dereference issue, but it mistakenly checks if the nfsd server is started. So fix it.

Fixes 62a063b8e7d1 "nfsd4: fix crash on writing v4_end_grace before nfsd startup"
---
 fs/nfsd/nfsctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfsctl.c +1 -1
index 72a7681..f2feb2d 100644
@@ -1126,7 +1126,7 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)
 		case 'Y':
 		case 'y':
 		case '1':
-			if (nn->nfsd_serv)
+			if (!nn->nfsd_serv)
 				return -EBUSY;
 			nfsd4_end_grace(nn);
 			break;
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 8 lines · Yihao Wu
Quoted 1 line

From 04ddefd79a5cd410d65b7a30593ac915b9fab687 Mon Sep 17 00:00:00 2001

From: Yihao Wu <[email protected]>
Date: Wed, 6 Mar 2019 21:03:50 +0800
Subject: [PATCH] nfsd: fix wrong check in write_v4_end_grace()

Commit 62a063b8e7d1 "nfsd4: fix crash on writing v4_end_grace before nfsd startup" is trying to fix a NULL dereference issue, but it mistakenly checks if the nfsd server is started. So fix it.

Applied, thanks!--b.

Quoted 24 lines
Fixes 62a063b8e7d1 "nfsd4: fix crash on writing v4_end_grace before nfsd startup"
---
 fs/nfsd/nfsctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfsctl.c +1 -1
index 72a7681..f2feb2d 100644
@@ -1126,7 +1126,7 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)
 		case 'Y':
 		case 'y':
 		case '1':
-			if (nn->nfsd_serv)
+			if (!nn->nfsd_serv)
 				return -EBUSY;
 			nfsd4_end_grace(nn);
 			break;
Signature · 1 line
1.8.3.1