• Jessica Yu's avatar
    modules: always page-align module section allocations · 38f054d5
    Jessica Yu authored
    Some arches (e.g., arm64, x86) have moved towards non-executable
    module_alloc() allocations for security hardening reasons. That means
    that the module loader will need to set the text section of a module to
    executable, regardless of whether or not CONFIG_STRICT_MODULE_RWX is set.
    
    When CONFIG_STRICT_MODULE_RWX=y, module section allocations are always
    page-aligned to handle memory rwx permissions. On some arches with
    CONFIG_STRICT_MODULE_RWX=n however, when setting the module text to
    executable, the BUG_ON() in frob_text() gets triggered since module
    section allocations are not page-aligned when CONFIG_STRICT_MODULE_RWX=n.
    Since the set_memory_* API works with pages, and since we need to call
    set_memory_x() regardless of whether CONFIG_STRICT_MODULE_RWX is set, we
    might as well page-align all module section allocations for ease of
    managing rwx permissions of module sections (text, rodata, etc).
    
    Fixes: 2eef1399
    
     ("modules: fix BUG when load module with rodata=n")
    Reported-by: default avatarMartin Kaiser <lists@kaiser.cx>
    Reported-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
    Tested-by: default avatarDavid Lechner <david@lechnology.com>
    Tested-by: default avatarMartin Kaiser <martin@kaiser.cx>
    Tested-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
    Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
    38f054d5
module.c 113 KB