mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c4ba3689a9061471c8bc32dfb7634c868a34b286
rockchip-kernel/kernel
History
Andy Lutomirski 94702e5561 UPSTREAM: fs,userns: Change inode_capable to capable_wrt_inode_uidgid 
The kernel has no concept of capabilities with respect to inodes; inodes
exist independently of namespaces.  For example, inode_capable(inode,
CAP_LINUX_IMMUTABLE) would be nonsense.

This patch changes inode_capable to check for uid and gid mappings and
renames it to capable_wrt_inode_uidgid, which should make it more
obvious what it does.

Fixes CVE-2014-4014.

Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: stable@vger.kernel.org
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

BUG=chromium:427055
TEST=kernel compiles and boots

(cherry picked from commit 23adbe12ef)
Signed-off-by: Stephen Barber <smbarber@chromium.org>

Change-Id: Iff4e262160fe3b05783bff1c8cf08825792c97d7
Reviewed-on: https://chromium-review.googlesource.com/235422
Trybot-Ready: Stephen Barber <smbarber@chromium.org>
Tested-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Commit-Queue: Stephen Barber <smbarber@chromium.org>
2014-12-13 01:17:25 +00:00
..
cpu
sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding
2014-01-13 17:38:55 +01:00
debug
UPSTREAM: KGDB: make kgdb_breakpoint() as noinline
2014-06-18 01:09:06 +00:00
events
perf: Fix hotplug splat
2014-02-27 12:38:03 +01:00
gcov
gcov: reuse kbasename helper
2013-11-13 12:09:34 +09:00
irq
UPSTREAM: genirq: Add irq_domain-aware core IRQ handler
2014-12-06 01:13:41 +00:00
locking
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-01-20 10:42:08 -08:00
power
CHROMIUM: wakeup: Set wakeup_type to automatic during dark resume
2014-12-12 06:10:12 +00:00
printk
CHROMIUM: bitfix: add suspend_volatile annotations for 3.8
2014-05-14 18:04:03 -07:00
rcu
CHROMIUM: Fix possible array-out-of-bounds access for rcutree.c.
2014-05-07 17:06:17 -07:00
sched
CHROMIUM: Eliminate task stack trace duplication
2014-05-07 17:06:19 -07:00
time
UPSTREAM: alarmtimer: Fix bug where relative alarm timers were treated as absolute
2014-12-02 01:58:26 +00:00
trace
UPSTREAM: ftrace: Do not pass data to ftrace_dyn_arch_init
2014-08-08 19:50:45 +00:00
.gitignore
Ignore generated file kernel/x509_certificate_list
2013-12-10 18:21:34 +00:00
acct.c
fs: Fix hang with BSD accounting on frozen filesystem
2013-05-04 14:57:58 -04:00
async.c
async: rename and redefine async_func_ptr
2013-03-12 13:59:14 -07:00
audit_tree.c
inotify: Fix reporting of cookies for inotify events
2014-02-18 11:17:17 +01:00
audit_watch.c
inotify: Fix reporting of cookies for inotify events
2014-02-18 11:17:17 +01:00
audit.c
AUDIT: Allow login in non-init namespaces
2014-03-30 17:02:53 -07:00
audit.h
audit: Use struct net not pid_t to remember the network namespce to reply in
2014-02-28 04:04:33 -08:00
auditfilter.c
audit: Update kdoc for audit_send_reply and audit_list_rules_send
2014-03-08 15:31:54 -08:00
auditsc.c
execve: use 'struct filename *' for executable name passing
2014-02-05 12:54:53 -08:00
backtracetest.c
…
bounds.c
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
capability.c
UPSTREAM: fs,userns: Change inode_capable to capable_wrt_inode_uidgid
2014-12-13 01:17:25 +00:00
cgroup_freezer.c
cgroup: replace cftype->read_seq_string() with cftype->seq_show()
2013-12-05 12:28:04 -05:00
cgroup.c
cgroup: fix a failure path in create_css()
2014-03-18 17:15:36 -04:00
compat.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-01 07:21:43 -07:00
configs.c
proc: Supply PDE attribute setting accessor functions
2013-05-01 17:29:18 -04:00
context_tracking.c
context_tracking: Wrap static key check into more intuitive function name
2013-12-02 20:43:14 +01:00
cpu_pm.c
…
cpu.c
CHROMIUM: cpu: add idle notifiers
2014-04-07 21:52:25 -07:00
cpuset.c
cpuset: fix a race condition in __cpuset_node_allowed_softwall()
2014-02-27 09:39:54 -05:00
crash_dump.c
…
cred.c
…
delayacct.c
kernel/delayacct.c: remove redundant checking in __delayacct_add_tsk()
2013-11-13 12:09:12 +09:00
dma.c
…
elfcore.c
switch elf_core_write_extra_phdrs() to dump_emit()
2013-11-09 00:16:23 -05:00
exec_domain.c
…
exit.c
introduce for_each_thread() to replace the buggy while_each_thread()
2014-01-21 16:19:46 -08:00
extable.c
kernel/extable: fix address-checks for core_kernel and init areas
2013-11-28 09:49:41 -08:00
fork.c
UPSTREAM: seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock
2014-09-29 23:19:43 +00:00
freezer.c
libata, freezer: avoid block device removal while system is frozen
2013-12-19 13:50:32 -05:00
futex_compat.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-02-23 18:50:11 -08:00
futex.c
UPSTREAM: futex: Make lookup_pi_state more robust
2014-06-06 01:14:50 +00:00
groups.c
userns: Kill nsown_capable it makes the wrong thing easy
2013-08-30 23:44:11 -07:00
hrtimer.c
CHROMIUM: Revert "hrtimer: Add hrtimer support for CLOCK_TAI"
2014-05-07 17:26:36 -07:00
hung_task.c
CHROMIUM: hung_task: dump all UNINTERUPTIBLE tasks
2014-05-07 17:26:20 -07:00
irq_work.c
…
itimer.c
…
jump_label.c
static_key: WARN on usage before jump_label_init was called
2013-10-19 19:45:35 -04:00
kallsyms.c
kernel: kallsyms: memory override issue, need check destination buffer length
2013-04-15 15:17:26 +09:30
kcmp.c
…
Kconfig.freezer
…
Kconfig.hz
kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS
2013-11-15 09:32:22 +09:00
Kconfig.locks
locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"
2013-05-28 08:50:00 +02:00
Kconfig.preempt
…
kexec.c
kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
2014-01-27 21:02:40 -08:00
kmod.c
Revert "PM / Sleep: Mitigate race between the freezer and request_firmware()"
2014-05-07 17:05:55 -07:00
kprobes.c
kprobes: use KSYM_NAME_LEN to size identifier buffers
2013-11-13 12:09:26 +09:00
ksysfs.c
kdump: fix exported size of vmcoreinfo note
2014-01-23 16:37:03 -08:00
kthread.c
UPSTREAM: kthread: fix return value of kthread_create() upon SIGKILL.
2014-08-08 19:50:51 +00:00
latencytop.c
…
Makefile
CHROMIUM: add test_module module
2014-05-02 18:50:11 -07:00
module_signing.c
keys: change asymmetric keys to use common hash definitions
2013-10-25 17:15:18 -04:00
module-internal.h
KEYS: Separate the kernel signature checking keyring from module signing
2013-09-25 17:17:01 +01:00
module.c
module: Add missing newline in printk call.
2014-01-21 09:59:16 +10:30
notifier.c
…
nsproxy.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2013-09-07 14:35:32 -07:00
padata.c
padata: Fix wrong usage of rcu_dereference()
2013-12-05 21:28:42 +08:00
panic.c
PM / Sleep: Mark oops_id as suspend_volatile
2014-05-14 18:04:02 -07:00
params.c
params: improve standard definitions
2013-12-04 14:09:46 +10:30
pid_namespace.c
pid_namespace: make freeing struct pid_namespace rcu-delayed
2013-10-24 23:43:29 -04:00
pid.c
pidns: fix free_pid() to handle the first fork failure
2013-09-30 14:31:03 -07:00
posix-cpu-timers.c
posix-timers: Convert abuses of BUG_ON to WARN_ON
2013-12-09 16:56:29 +01:00
posix-timers.c
CHROMIUM: Add CLOCK_SYSTEM_TRACE to export the trace clock to user space.
2014-05-07 17:26:37 -07:00
profile.c
mm: fix GFP_THISNODE callers and clarify
2014-03-10 17:26:19 -07:00
ptrace.c
exec/ptrace: fix get_dumpable() incorrect tests
2013-11-13 12:09:33 +09:00
range.c
range: Do not add new blank slot with add_range_with_merge
2013-06-18 11:32:10 -05:00
reboot.c
FROMLIST: kernel: Add support for kernel restart handler call chain
2014-08-22 00:35:54 +00:00
relay.c
UPSTREAM: treewide: Fix typo in Documentation/DocBook
2014-11-04 07:03:32 +00:00
res_counter.c
memcg: reduce function dereference
2013-09-12 15:38:02 -07:00
resource.c
kernel/resource.c: remove the unneeded assignment in function __find_resource
2013-07-03 16:08:06 -07:00
seccomp.c
BACKPORT: syscall_get_arch: remove useless function arguments
2014-09-29 23:19:51 +00:00
signal.c
UPSTREAM: treewide: Fix typo in Documentation/DocBook
2014-11-04 07:03:32 +00:00
smp.c
kernel/smp.c: remove cpumask_ipi
2014-01-30 16:56:54 -08:00
smpboot.c
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
smpboot.h
…
softirq.c
UPSTREAM: genirq: x86: Ensure that dynamic irq allocation does not conflict
2014-09-30 05:42:12 +00:00
stacktrace.c
CHROMIUM: Eliminate task stack trace duplication
2014-05-07 17:06:19 -07:00
stop_machine.c
stop_machine: Fix^2 race between stop_two_cpus() and stop_cpus()
2014-03-11 11:33:47 +01:00
sys_ni.c
BACKPORT: seccomp: add "seccomp" syscall
2014-09-29 23:18:32 +00:00
sys.c
UPSTREAM: sched: move no_new_privs into new atomic flags
2014-09-29 23:18:57 +00:00
sysctl_binary.c
kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
2013-11-13 12:09:33 +09:00
sysctl.c
Merge branch 'chromeos-security-3.14' into chromeos-3.14
2014-05-16 15:27:36 -07:00
system_certificates.S
KEYS: correct alignment of system_certificate_list content in assembly file
2013-12-10 18:25:28 +00:00
system_keyring.c
KEYS: correct alignment of system_certificate_list content in assembly file
2013-12-10 18:25:28 +00:00
task_work.c
task_work: documentation
2013-09-11 15:58:27 -07:00
taskstats.c
genetlink: only pass array to genl_register_family_with_ops()
2013-11-19 16:39:05 -05:00
test_kprobes.c
kernel/: rename random32() to prandom_u32()
2013-04-29 18:28:42 -07:00
test_module.c
CHROMIUM: add test_module module
2014-05-02 18:50:11 -07:00
time.c
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
timeconst.bc
kernel: Replace timeconst.pl with a bc script
2013-02-16 23:17:25 +01:00
timer.c
CHROMIUM: bitfix: add suspend_volatile annotations for 3.8
2014-05-14 18:04:03 -07:00
tracepoint.c
tracing: Do not add event files for modules that fail tracepoints
2014-03-03 21:11:05 -05:00
tsacct.c
…
uid16.c
userns: Kill nsown_capable it makes the wrong thing easy
2013-08-30 23:44:11 -07:00
up.c
kernel: provide a __smp_call_function_single stub for !CONFIG_SMP
2013-11-15 09:32:22 +09:00
user_namespace.c
user_namespace.c: Remove duplicated word in comment
2014-02-20 11:58:35 -08:00
user-return-notifier.c
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
user.c
KEYS: fix uninitialized persistent_keyring_register_sem
2013-12-13 15:59:11 +00:00
utsname_sysctl.c
kernel/utsname_sysctl.c: put get/get_uts() into CONFIG_PROC_SYSCTL code block
2013-02-27 19:10:22 -08:00
utsname.c
userns: Kill nsown_capable it makes the wrong thing easy
2013-08-30 23:44:11 -07:00
watchdog.c
CHROMIUM: watchdog: touch_nmi_watchdog should only touch local cpu not every one
2014-05-07 17:06:28 -07:00
workqueue_internal.h
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
workqueue.c
workqueue: ensure @task is valid across kthread_stop()
2014-02-18 16:35:20 -05:00