From patchwork Tue Sep 15 14:13:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 309706 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 DD092C31E40 for ; Tue, 15 Sep 2020 23:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FC9C21655 for ; Tue, 15 Sep 2020 23:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600211532; bh=xW9liJaxqgaUSCMWwyrHZnak/GMUg57/bVOp4oy6rUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qLgabYKL4XKOhl81FEIq24O69zRReQ03oE5R/tks6eugwlXKVGtuoKNk93wIbnEkg Wr0lODCKXk/vcM8lopqL5tTpu2tZ/32aydFxMl0aG2/XN2kLf0JAZKj4TtF7QzJeab 5S8/wwJ8bP/qocSYgrO52o7uZghHA2zgSxlVlaLo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727459AbgIOXMK (ORCPT ); Tue, 15 Sep 2020 19:12:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:48794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727271AbgIOOki (ORCPT ); Tue, 15 Sep 2020 10:40:38 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 44091206C9; Tue, 15 Sep 2020 14:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600180230; bh=xW9liJaxqgaUSCMWwyrHZnak/GMUg57/bVOp4oy6rUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dbmf7kVsUe4VskDc2CEKCNKnXCdUed/2R6OupoIDiAQ1yGNHFZhG2adIBY+ebJrpq ffqb6vpUSoCrWxozfR5nz6eCHBQSFpuhsyjSkbMhh+WMYGN6qVpzTPQgI81/vLa+Bl uluXGmMfPnkvJzpafREwFpZ6EJsYUufA6DcSvhNg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladis Dronov Subject: [PATCH 5.8 160/177] debugfs: Fix module state check condition Date: Tue, 15 Sep 2020 16:13:51 +0200 Message-Id: <20200915140701.362722769@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140653.610388773@linuxfoundation.org> References: <20200915140653.610388773@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vladis Dronov commit e3b9fc7eec55e6fdc8beeed18f2ed207086341e2 upstream. The '#ifdef MODULE' check in the original commit does not work as intended. The code under the check is not built at all if CONFIG_DEBUG_FS=y. Fix this by using a correct check. Fixes: 275678e7a9be ("debugfs: Check module state before warning in {full/open}_proxy_open()") Signed-off-by: Vladis Dronov Cc: stable Link: https://lore.kernel.org/r/20200811150129.53343-1-vdronov@redhat.com Signed-off-by: Greg Kroah-Hartman --- fs/debugfs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c @@ -177,7 +177,7 @@ static int open_proxy_open(struct inode goto out; if (!fops_get(real_fops)) { -#ifdef MODULE +#ifdef CONFIG_MODULES if (real_fops->owner && real_fops->owner->state == MODULE_STATE_GOING) goto out; @@ -312,7 +312,7 @@ static int full_proxy_open(struct inode goto out; if (!fops_get(real_fops)) { -#ifdef MODULE +#ifdef CONFIG_MODULES if (real_fops->owner && real_fops->owner->state == MODULE_STATE_GOING) goto out;