From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 483A2C43381 for ; Mon, 18 Feb 2019 14:08:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A41621916 for ; Mon, 18 Feb 2019 14:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498909; bh=OrtPiLExRlQQDWmtPQR8DYgMbvnrgC91nH+2C3i+0ug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kKPjcr5iEaB1yDVF4vUWVQrBoBMfEh9ZUQY5lpQMNqCzOVYXCz3ls1+jqjy9bDv8Z Pc7vtjUdNyGqBz0G3OzcauLhDHdrAezF5cAmglI+/CJDtxyFMQoXIRxSy7rSL5QO8S 1YKO1vsb4X5DUfgj+tS8RTL5oPkLf77eVomU0Zk0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390914AbfBROI1 (ORCPT ); Mon, 18 Feb 2019 09:08:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:51694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390899AbfBROIX (ORCPT ); Mon, 18 Feb 2019 09:08:23 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 839CB204FD; Mon, 18 Feb 2019 14:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498903; bh=OrtPiLExRlQQDWmtPQR8DYgMbvnrgC91nH+2C3i+0ug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yw/Giaan1561Qfz0DeGP8ylidp0HryjCGOTWfjqaiL+QRnPVqH5CnPlw5+15lvvpq bjBnQW7SmQKnfBDp4p6gyjntzXdVpecfQwKvv21HTz/Wf+QpNeyytL54E36CL83+EU GC9TdtHSX7DQ/9Bt6XSfJ8LMONSh+j31oIKwn2DI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anatoly Trosinenko , "J. Bruce Fields" , Sasha Levin Subject: [PATCH 3.18 014/108] nfsd4: fix crash on writing v4_end_grace before nfsd startup Date: Mon, 18 Feb 2019 14:43:10 +0100 Message-Id: <20190218133520.167754768@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 62a063b8e7d1db684db3f207261a466fa3194e72 ] Anatoly Trosinenko reports that this: 1) Checkout fresh master Linux branch (tested with commit e195ca6cb) 2) Copy x84_64-config-4.14 to .config, then enable NFS server v4 and build 3) From `kvm-xfstests shell`: results in NULL dereference in locks_end_grace. Check that nfsd has been started before trying to end the grace period. Reported-by: Anatoly Trosinenko Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfsctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index ca73ca79a0ee..0e8574af298b 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1110,6 +1110,8 @@ 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) + return -EBUSY; nfsd4_end_grace(nn); break; default: -- 2.19.1