Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecab6ab1 authored by Yihao Wu's avatar Yihao Wu Committed by Greg Kroah-Hartman
Browse files

nfsd: fix wrong check in write_v4_end_grace() 



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@vger.kernel.org
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Signed-off-by: default avatarYihao Wu <wuyihao@linux.alibaba.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8056912c

fs/nfsd/nfsctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;