modules: fix compile error if don't have strict module rwx
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 25 Jun 2019 09:40:28 +0000 (17:40 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Sep 2019 07:09:40 +0000 (09:09 +0200)
commit52bfcc9c8406dccecdd937a4c920ccdd8f88257f
treeb8a07960f2c9722890f37c8d5bda19962deb054b
parentae415d7a27071d807cfdd04c27dc02cce43c10c3
modules: fix compile error if don't have strict module rwx

commit 93651f80dcb616b8c9115cdafc8e57a781af22d0 upstream.

If CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not defined,
we need stub for module_enable_nx() and module_enable_x().

If CONFIG_ARCH_HAS_STRICT_MODULE_RWX is defined, but
CONFIG_STRICT_MODULE_RWX is disabled, we need stub for
module_enable_nx.

Move frob_text() outside of the CONFIG_STRICT_MODULE_RWX,
because it is needed anyway.

Fixes: 2eef1399a866 ("modules: fix BUG when load module with rodata=n")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/module.c