[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190322111253.358661366@linuxfoundation.org>
Date: Fri, 22 Mar 2019 12:16:26 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Joseph Qi <joseph.qi@...ux.alibaba.com>,
Yihao Wu <wuyihao@...ux.alibaba.com>,
"J. Bruce Fields" <bfields@...hat.com>
Subject: [PATCH 4.14 158/183] nfsd: fix wrong check in write_v4_end_grace()
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihao Wu <wuyihao@...ux.alibaba.com>
commit dd838821f0a29781b185cd8fb8e48d5c177bd838 upstream.
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"
Cc: stable@...r.kernel.org
Reviewed-by: Joseph Qi <joseph.qi@...ux.alibaba.com>
Signed-off-by: Yihao Wu <wuyihao@...ux.alibaba.com>
Signed-off-by: J. Bruce Fields <bfields@...hat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
fs/nfsd/nfsctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1126,7 +1126,7 @@ static ssize_t write_v4_end_grace(struct
case 'Y':
case 'y':
case '1':
- if (nn->nfsd_serv)
+ if (!nn->nfsd_serv)
return -EBUSY;
nfsd4_end_grace(nn);
break;
Powered by blists - more mailing lists