Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp637246img; Fri, 22 Mar 2019 05:39:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwi3xV+uiCAMyED0PT51YOX8YU5juJeMZBHWP7UvDQ6RPw9q0RCXiuSPQD5FtKKldBz6D/O X-Received: by 2002:a17:902:6a4:: with SMTP id 33mr9421372plh.140.1553258355094; Fri, 22 Mar 2019 05:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553258355; cv=none; d=google.com; s=arc-20160816; b=fCfwuMZMg5X/oR3hHlacBBtKS4tJxp7qSwaH735oHG92mGy6MY775JOYhdxfvmi7PK kE2L1VYd8AHuVKZDvuQ2VzqruFGB+v4FC780tasKJ6rpQncMv2EIgi/5OqEcttSvIZFJ gfhwRrJboP1C2J57+3ruSGI8SXdZdA6NwjTSlXU19IA5Y0fxXCSNmdBsLJSOCLXaHTn6 a6qpjNRlkuvQ5gwLNteNRp2LdUZg5qJHLN8l6px8AhXcrLTfohMQJeQSe5cEIFGKFRiR KPavGs3LhDyuC6tWdA4eOaaGzRvQ+KUWFK58oqscLa7sOCY5os0ZmuUbF+apN9+ZySCa WxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qubhMtoNWxmW5k774O55xZocs6j0x3e4Kbsotc0OFOw=; b=ml4Yjq9W+AKYrGmFqbCFy5PdQJQJue8bnJ8HTPvFiQjZsfoG89ytkKmeXhYb+P/s9m /M/eLfCkR+/sOYvrsGjJ2QcTMh72GJVfTpra9guPq8moBvgIo551VFB8GJltqC4HvVGx JhWJaS3T3QA/gf87BSYwzaOQFoLcgPXLq0UNzN61LasamjwH3hAzpr9m/h0IsupJJm1K HnaX9e4AiQ+K3OvM5GB3yr5e0K5Y7bbScWp8/K0Hwn5qkcqx/lRD1h/LY1Oh6Q9U1hE5 K40x8DIQzxs6h8MTDJsFgJSRQkhN022L2Ex0NZn3HciRG703Pz5dJzs5Eh6oa6pl84jQ qv7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BZKQZZdB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h3si6441566pfj.137.2019.03.22.05.39.00; Fri, 22 Mar 2019 05:39:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BZKQZZdB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388856AbfCVMJL (ORCPT + 99 others); Fri, 22 Mar 2019 08:09:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:47580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389252AbfCVMJJ (ORCPT ); Fri, 22 Mar 2019 08:09:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 C007B20685; Fri, 22 Mar 2019 12:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256549; bh=4GdY35UyizSYrAWL9+E1FqQOUY9I+nTX80PT0Nc7ric=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BZKQZZdB2kD8WNoM0NFXXqBgZv7NQQr6Y1MZKGu7PoU/S6abzB3scaPsMLtoTKKIT EJ64t1IDSzKoaqpy2IYGSsNt5rmBYlfXIVxAv0LIP5/su/tbxgixe02eVOVZEu6OV5 mY6zxbgvYeJR7wxGv/pAAqk6n98YHfKFC/9DcVVE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joseph Qi , Yihao Wu , "J. Bruce Fields" Subject: [PATCH 4.19 245/280] nfsd: fix wrong check in write_v4_end_grace() Date: Fri, 22 Mar 2019 12:16:38 +0100 Message-Id: <20190322111340.267107303@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yihao Wu 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: Joseph Qi Signed-off-by: Yihao Wu Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- 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;