Kees Cook
baedb247fe
kexec_file: adjust declaration of kexec_purgatory ...
Defining kexec_purgatory as a zero-length char array upsets compile time
size checking. Since this is built on a per-arch basis, define it as an
unsized char array (like is done for other similar things, e.g. linker
sections). This silences the warning generated by the future
CONFIG_FORTIFY_SOURCE, which did not like the memcmp() of a "0 byte"
array. This drops the __weak and uses an extern instead, since both
users define kexec_purgatory.
Change-Id: I0bc8e57b155461d6c8c904e82eff6554f07f290b
Link: http://lkml.kernel.org/r/1497903987-21002-4-git-send-email-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Daniel Micay <danielmicay@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: e2ae8ab4b571e2e4094a28acb60649bc2732c67f
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2017-08-07 17:39:02 -07:00
This is the 4.9.39 stable release
2017-07-21 08:55:50 +02:00
Merge remote-tracking branch '4.9/tmp-598195a' into msm-4.9
2017-07-13 20:03:03 -07:00
This is the 4.9.6 stable release
2017-01-31 13:55:27 -08:00
Merge remote-tracking branch '4.9/tmp-9ae2c67' into 4.9
2017-07-28 16:52:35 -07:00
gcov: add support for gcc version >= 6
2016-07-15 14:54:27 +09:00
Merge "genirq: Use irq_set_affinity_locked to change irq affinity"
2017-08-07 09:19:38 -07:00
livepatch/module: make TAINT_LIVEPATCH module-specific
2016-08-26 14:42:08 +02:00
Merge remote-tracking branch '4.9/tmp-3f353c3' into 4.9
2017-07-24 17:23:13 -07:00
power: qos: check for NULL irq desc object
2017-07-24 14:06:37 -06:00
Merge branch 'upstream-linux-4.9.y' into android-4.9
2017-02-23 14:29:44 -08:00
Merge remote-tracking branch '4.9/tmp-9ae2c67' into 4.9
2017-07-28 16:52:35 -07:00
Merge "sched: Don't update idle_cpus_mask during core isolation"
2017-08-07 09:19:18 -07:00
Merge remote-tracking branch '4.9/tmp-9ae2c67' into 4.9
2017-07-28 16:52:35 -07:00
trace: prevent NULL pointer dereference
2017-08-01 17:51:28 -07:00
certs: add .gitignore to stop git nagging about x509_certificate_list
2015-10-21 15:18:35 +01:00
async: export current_is_async()
2015-11-19 17:51:48 +01:00
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit
2016-10-04 14:21:41 -07:00
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit
2016-07-29 17:54:17 -07:00
wrappers for ->i_mutex access
2016-01-22 18:04:28 -05:00
audit: cleanup prune_tree_thread
2016-04-04 09:46:47 -04:00
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit
2016-09-01 15:55:56 -07:00
audit: add fields to exclude filter by reusing user filter
2016-06-27 11:01:00 -04:00
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit
2016-10-04 14:21:41 -07:00
ptrace: Capture the ptracer's creds not PT_PTRACE_CAP
2017-01-06 10:40:13 +01:00
Merge remote-tracking branch '4.9/tmp-da3493c' into 4.9
2017-06-15 13:20:27 -07:00
cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friends
2015-12-03 10:24:08 -05:00
cgroup/pids: remove spurious suspicious RCU usage warning
2017-03-26 13:05:58 +02:00
context_tracking: Switch to new static_branch API
2015-11-24 09:56:43 +01:00
smp/hotplug: Move unparking of percpu threads to the control CPU
2017-07-12 16:20:25 -07:00
lpm-levels: Do not disable non-sec interrupts in suspend
2017-02-23 10:43:32 -07:00
Merge remote-tracking branch '4.9/tmp-da3493c' into 4.9
2017-06-15 13:20:27 -07:00
cred: Reject inodes with invalid ids in set_create_file_as()
2016-06-30 18:05:09 -05:00
kmemcg: account certain kmem allocations to memcg
2016-01-14 16:00:49 -08:00
android/lowmemorykiller: Ignore tasks with freed mm
2017-07-20 11:17:28 +05:30
kernel/extable.c: mark core_kernel_text notrace
2017-07-21 07:42:21 +02:00
Merge remote-tracking branch '4.9/tmp-9ae2c67' into 4.9
2017-07-28 16:52:35 -07:00
freezer, oom: check TIF_MEMDIE on the correct task
2016-07-28 16:07:41 -07:00
futex: Add missing error handling to FUTEX_REQUEUE_PI
2017-03-22 12:43:40 +01:00
ptrace: use fsuid, fsgid, effective creds for fs access checks
2016-01-20 17:09:18 -08:00
cred: simpler, 1D supplementary groups
2016-10-07 18:46:30 -07:00
hung_task: allow hung_task_panic when hung_task_warnings is 0
2016-10-11 15:06:33 -07:00
treewide: Remove old email address
2015-11-23 09:44:58 +01:00
jump_labels: API for flushing deferred jump label updates
2017-01-19 20:17:59 +01:00
kallsyms: add support for relative offsets in kallsyms address table
2016-03-15 16:55:16 -07:00
ptrace: use fsuid, fsgid, effective creds for fs access checks
2016-01-20 17:09:18 -08:00
kcov: add missing #include <linux/sched.h>
2016-12-07 17:10:00 -08:00
kexec: allow architectures to override boot mapping
2016-08-02 19:35:27 -04:00
kexec: add restriction on kexec_load() segment sizes
2016-08-02 19:35:31 -04:00
kexec_file: adjust declaration of kexec_purgatory
2017-08-07 17:39:02 -07:00
kexec_file: adjust declaration of kexec_purgatory
2017-08-07 17:39:02 -07:00
kmod: don't run async usermode helper as a child of kworker thread
2015-10-23 17:55:10 +09:00
tracing/kprobes: Enforce kprobes teardown after testing
2017-05-25 15:44:47 +02:00
kexec: add a kexec_crash_loaded() function
2016-08-02 19:35:30 -04:00
Revert "kthread: Ensure task isn't preempted before dequeue in kthread_parkme"
2017-07-12 16:20:39 -07:00
sched/debug: Make schedstats a runtime tunable that is disabled by default
2016-02-09 11:54:23 +01:00
kernel/watchdog.c: move hardlockup detector to separate file
2017-06-17 06:41:57 +02:00
Fix: Disable sys_membarrier when nohz_full is enabled
2017-03-12 06:41:45 +01:00
mm, devm_memremap_pages: hold device_hotplug lock over mem_hotplug_{begin, done}
2017-03-12 06:41:43 +01:00
Re-enable CONFIG_MODVERSIONS in a slightly weaker form
2016-11-29 16:01:30 -08:00
KEYS: Move the point of trust determination to __key_link()
2016-04-11 22:43:43 +01:00
cgroup: introduce cgroup namespaces
2016-02-16 13:04:58 -05:00
padata: free correct variable
2017-05-20 14:28:40 +02:00
kernel/panic.c: add missing \n
2017-07-05 14:40:24 +02:00
Nothing exciting, minor tweaks and cleanups.
2015-11-09 15:53:39 -08:00
Use after free from pid_nr_ns()
2017-02-15 17:40:08 -08:00
pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes
2017-05-25 15:44:38 +02:00
profile: Convert to hotplug state machine
2016-07-15 10:41:42 +02:00
ptrace: Properly initialize ptracer_cred on fork
2017-06-14 15:05:54 +02:00
relay: check array offset before using it
2017-01-12 11:39:30 +01:00
/proc/iomem: only expose physical resource addresses to privileged users
2016-04-14 12:56:09 -07:00
seccomp: Fix tracer exit notifications during fatal signals
2016-08-30 16:12:46 -07:00
signal: Only reschedule timers on signals timers have sent
2017-06-29 13:00:29 +02:00
smp: Do not wake up all idle CPUs
2017-02-07 14:50:30 -08:00
sched: Add per CPU load tracking for each task
2017-02-07 14:50:51 -08:00
cpu/hotplug: Create hotplug threads
2016-03-01 20:36:56 +01:00
sched: avoid migrating when softint on tgt cpu should be short
2017-06-07 05:53:14 +05:30
stacktrace, lockdep: Fix address, newline ugliness
2017-02-14 15:25:42 -08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-10-03 13:39:00 -07:00
ANDROID: mm: add a field to store names for private anonymous memory
2017-01-27 13:52:21 -08:00
x86/pkeys: Fix pkeys build breakage for some non-x86 arches
2016-09-13 14:41:36 +02:00
sched: Remove HMP related code and config
2017-07-22 13:54:48 +05:30
sysctl: add cold_boot sysctl entry
2017-01-11 13:57:41 -08:00
task_work: use READ_ONCE/lockless_dereference, avoid pi_lock if !task_works
2016-08-02 19:35:02 -04:00
taskstats: fix the length of cgroupstats_cmd_get_policy
2016-11-03 16:55:58 -04:00
torture: Convert torture_shutdown() to hrtimer
2016-08-22 10:01:49 -07:00
kernel/...: convert pr_warning to pr_warn
2016-03-22 15:36:02 -07:00
time, acct: Drop irq save & restore from __acct_update_integrals()
2016-02-29 09:53:09 +01:00
kernel/ucount.c: mark user_header with kmemleak_ignore()
2017-06-17 06:41:51 +02:00
cred: simpler, 1D supplementary groups
2016-10-07 18:46:30 -07:00
smp: Add function to execute a function synchronously on a CPU
2016-09-05 13:52:39 +02:00
Merge branch 'nsfs-ioctls' into HEAD
2016-09-22 20:00:36 -05:00
Merge branch 'nsfs-ioctls' into HEAD
2016-09-22 20:00:36 -05:00
Merge remote-tracking branch '4.9/tmp-75d78c7' into 4.9
2017-07-05 13:17:33 -07:00
kernel/watchdog: prevent false hardlockup on overloaded system
2017-06-17 06:41:57 +02:00
time: Remove CONFIG_TIMER_STATS
2017-05-11 13:26:42 -07:00
sched/core: Get rid of 'cpu' argument in wq_worker_sleeping()
2016-03-02 10:28:47 -05:00
baedb247fe