| From e3b9fc7eec55e6fdc8beeed18f2ed207086341e2 Mon Sep 17 00:00:00 2001 |
| From: Vladis Dronov <vdronov@redhat.com> |
| Date: Tue, 11 Aug 2020 17:01:29 +0200 |
| Subject: [PATCH] debugfs: Fix module state check condition |
| |
| 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 <vdronov@redhat.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20200811150129.53343-1-vdronov@redhat.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c |
| index b167d2d02148..a768a09430c3 100644 |
| --- a/fs/debugfs/file.c |
| +++ b/fs/debugfs/file.c |
| @@ -177,7 +177,7 @@ static int open_proxy_open(struct inode *inode, struct file *filp) |
| 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 *inode, struct file *filp) |
| 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; |
| -- |
| 2.27.0 |
| |
