diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-18 14:08:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 14:08:53 +1000 |
| commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
| tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /init/main.c | |
| parent | 315852b422972e6ebb1dfddaadada09e46a2681a (diff) | |
| parent | 76ef6b28ea4f81c3d511866a9b31392caa833126 (diff) | |
| download | linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.bz2 | |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index b795aa341a3a..fd37315835b4 100644 --- a/init/main.c +++ b/init/main.c @@ -423,7 +423,7 @@ static noinline void __ref rest_init(void) /* * Enable might_sleep() and smp_processor_id() checks. - * They cannot be enabled earlier because with CONFIG_PRREMPT=y + * They cannot be enabled earlier because with CONFIG_PREEMPT=y * kernel_thread() would trigger might_sleep() splats. With * CONFIG_PREEMPT_VOLUNTARY=y the init task might have scheduled * already, but it's stuck on the kthreadd_done completion. @@ -1034,6 +1034,13 @@ __setup("rodata=", set_debug_rodata); static void mark_readonly(void) { if (rodata_enabled) { + /* + * load_module() results in W+X mappings, which are cleaned up + * with call_rcu_sched(). Let's make sure that queued work is + * flushed so that we don't hit false positives looking for + * insecure pages which are W+X. + */ + rcu_barrier_sched(); mark_rodata_ro(); rodata_test(); } else |