Jann Horn 656d6e6f6d userns: move user access out of the mutex ...

commit 5820f140ed upstream.

The old code would hold the userns_state_mutex indefinitely if
memdup_user_nul stalled due to e.g. a userfault region. Prevent that by
moving the memdup_user_nul in front of the mutex_lock().

Note: This changes the error precedence of invalid buf/count/*ppos vs
map already written / capabilities missing.

Fixes: 22d917d80e ("userns: Rework the user_namespace adding uid/gid...")
Cc: stable@vger.kernel.org
Signed-off-by: Jann Horn <jannh@google.com>
Acked-by: Christian Brauner <christian@brauner.io>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2018-09-09 19:56:00 +02:00

..

bpf

bpf: hash map: decrement counter on error

2018-08-24 13:09:12 +02:00

cgroup

cgroup: fix rule checking for threaded mode switching

2018-03-28 18:24:37 +02:00

configs

ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.

2017-08-22 18:43:23 -07:00

debug

kdb: make "mdr" command repeat

2018-05-30 07:52:41 +02:00

events

perf/core: Fix perf_output_read_group()

2018-05-30 07:52:34 +02:00

gcov

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

irq

genirq: Make force irq threading setup more robust

2018-08-09 12:16:38 +02:00

livepatch

livepatch: Validate module/old func name length

2018-09-09 19:55:58 +02:00

locking

locking/rtmutex: Allow specifying a subclass for nested locking

2018-09-05 09:26:29 +02:00

power

PM / sleep: wakeup: Fix build error caused by missing SRCU support

2018-09-09 19:55:58 +02:00

printk

printk/tracing: Do not trace printk_nmi_enter()

2018-09-09 19:55:57 +02:00

rcu

rcu: Call touch_nmi_watchdog() while printing stall warnings

2018-05-30 07:52:39 +02:00

sched

sched/rt: Restore rt_runtime after disabling RT_RUNTIME_SHARE

2018-09-05 09:26:29 +02:00

time

nohz: Fix local_timer_softirq_pending()

2018-08-09 12:16:38 +02:00

trace

uprobes: Use synchronize_rcu() not synchronize_sched()

2018-09-09 19:55:58 +02:00

.gitignore

certs: add .gitignore to stop git nagging about x509_certificate_list

2015-10-21 15:18:35 +01:00

acct.c

kernel/acct.c: fix the acct->needcheck check in check_free_space()

2018-01-10 09:31:17 +01:00

async.c

kernel/async.c: revert "async: simplify lowest_in_progress()"

2018-02-16 20:23:05 +01:00

audit_fsnotify.c

Merge branch 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2017-05-03 11:05:15 -07:00

audit_tree.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

audit_watch.c

Merge tag 'audit-pr-20170816' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit

2017-08-16 16:48:34 -07:00

audit.c

audit: return on memory error to avoid null pointer dereference

2018-05-30 07:52:39 +02:00

audit.h

ipc: mqueue: Replace timespec with timespec64

2017-09-03 20:21:24 -04:00

auditfilter.c

audit: allow not equal op for audit by executable

2018-08-03 07:50:39 +02:00

auditsc.c

audit: fix potential null dereference 'context->module.name'

2018-08-06 16:20:49 +02:00

backtracetest.c

kernel/backtracetest.c: replace no level printk by pr_info()

2014-06-04 16:54:14 -07:00

bounds.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

capability.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

compat.c

compat: fix 4-byte infoleak via uninitialized struct field

2018-05-16 10:10:26 +02:00

configs.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

context_tracking.c

context_tracking: Switch to new static_branch API

2015-11-24 09:56:43 +01:00

cpu_pm.c

PM / CPU: replace raw_notifier with atomic_notifier

2017-07-31 13:09:49 +02:00

cpu.c

cpu/hotplug: Non-SMP machines do not make use of booted_once

2018-08-15 18:13:01 +02:00

crash_core.c

kdump: write correct address of mem_section into vmcoreinfo

2018-01-17 09:45:27 +01:00

crash_dump.c

crash_dump: Make is_kdump_kernel() accessible from modules

2014-08-25 15:42:19 -07:00

cred.c

doc: ReSTify credentials.txt

2017-05-18 10:30:19 -06:00

delayacct.c

delayacct: Use raw_spinlocks

2018-08-03 07:50:38 +02:00

dma.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

elfcore.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

exec_domain.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

exit.c

kernel/exit.c: export abort() to modules

2018-02-13 10:19:49 +01:00

extable.c

extable: Enable RCU if it is not watching in kernel_text_address()

2017-09-23 16:50:20 -04:00

fork.c

fork: unconditionally clear stack on fork

2018-08-03 07:50:20 +02:00

freezer.c

freezer, oom: check TIF_MEMDIE on the correct task

2016-07-28 16:07:41 -07:00

futex_compat.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

futex.c

futex: Fix OWNER_DEAD fixup

2018-02-03 17:38:47 +01:00

groups.c

kernel: make groups_sort calling a responsibility group_info allocators

2017-12-20 10:10:18 +01:00

hung_task.c

kernel/hung_task.c: show all hung tasks before panic

2018-08-03 07:50:23 +02:00

irq_work.c

treewide: Remove old email address

2015-11-23 09:44:58 +01:00

jump_label.c

jump_label: Invoke jump_label_test() via early_initcall()

2017-12-14 09:53:13 +01:00

kallsyms.c

kernel/kallsyms.c: replace all_var with IS_ENABLED(CONFIG_KALLSYMS_ALL)

2017-07-10 16:32:34 -07:00

kcmp.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

locking/mutex: Allow MUTEX_SPIN_ON_OWNER when DEBUG_MUTEXES

2016-10-25 11:31:51 +02:00

Kconfig.preempt

…

kcov.c

kcov: ensure irq code sees a valid area

2018-08-03 07:50:22 +02:00

kexec_core.c

x86/mm, kexec: Allow kexec to be used with SME

2017-07-18 11:38:04 +02:00

kexec_file.c

kexec_file: adjust declaration of kexec_purgatory

2017-07-12 16:26:02 -07:00

kexec_internal.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

kexec.c

kdump: protect vmcoreinfo data under the crash memory

2017-07-12 16:26:00 -07:00

kmod.c

kmod: move #ifdef CONFIG_MODULES wrapper to Makefile

2017-09-08 18:26:51 -07:00

kprobes.c

kprobes: Make list and blacklist root user read only

2018-09-05 09:26:41 +02:00

ksysfs.c

kexec: move vmcoreinfo out of the kernel's .bss section

2017-07-12 16:25:59 -07:00

kthread.c

kthread, tracing: Don't expose half-written comm when creating kthreads

2018-08-03 07:50:21 +02:00

latencytop.c

sched/headers: Prepare to move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h>

2017-03-02 08:42:39 +01:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

memremap.c

mm: Fix memory size alignment in devm_memremap_pages_release()

2018-02-22 15:42:27 +01:00

module_signing.c

KEYS: Move the point of trust determination to __key_link()

2016-04-11 22:43:43 +01:00

module-internal.h

…

module.c

init: fix false positives in W+X checking

2018-06-21 04:02:57 +09:00

notifier.c

kernel/notifier.c: simplify expression

2017-02-24 17:46:56 -08:00

nsproxy.c

perf: Add PERF_RECORD_NAMESPACES to include namespaces related info

2017-03-13 15:57:41 -03:00

padata.c

padata: Avoid nested calls to cpus_read_lock() in pcrypt_init_padata()

2017-05-26 10:10:37 +02:00

panic.c

locking/refcounts, x86/asm: Implement fast refcount overflow protection

2017-08-17 10:40:26 +02:00

params.c

kernel/params.c: improve STANDARD_PARAM_DEF readability

2017-10-03 17:54:26 -07:00

pid_namespace.c

userns,pidns: Verify the userns for new pid namespaces

2017-07-20 07:43:58 -05:00

pid.c

pids: make task_tgid_nr_ns() safe

2017-08-21 12:47:31 -07:00

profile.c

sched/headers: Prepare to move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h>

2017-03-02 08:42:39 +01:00

ptrace.c

signal: Remove kernel interal si_code magic

2017-07-24 14:30:28 -05:00

range.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

reboot.c

kexec: split kexec_load syscall from kexec core code

2015-09-10 13:29:01 -07:00

relay.c

kernel/relay.c: limit kmalloc size to KMALLOC_MAX_SIZE

2018-05-30 07:52:00 +02:00

resource.c

resource: fix integer overflow at reallocation

2018-04-24 09:36:22 +02:00

seccomp.c

seccomp: Move speculation migitation control to arch code

2018-05-22 18:54:04 +02:00

signal.c

sched/core: Introduce set_special_state()

2018-06-21 04:02:54 +09:00

smp.c

cpu/hotplug: Fix SMT supported evaluation

2018-08-15 18:13:00 +02:00

smpboot.c

watchdog/core, powerpc: Lock cpus across reconfiguration

2017-10-04 10:53:54 +02:00

smpboot.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

softirq.c

Mark HI and TASKLET softirq synchronous

2018-08-15 18:12:47 +02:00

stacktrace.c

stacktrace/x86: add function for detecting reliable stack traces

2017-03-08 09:18:02 +01:00

stop_machine.c

stop_machine: Atomically queue and wake stopper threads

2018-09-05 09:26:36 +02:00

sys_ni.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

sys.c

sys: don't hold uts_sem while accessing userspace memory

2018-09-09 19:56:00 +02:00

sysctl_binary.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

sysctl.c

kmemcheck: rip it out

2018-02-22 15:42:24 +01:00

task_work.c

locking/barriers: Convert users of lockless_dereference() to READ_ONCE()

2017-12-25 14:26:21 +01:00

taskstats.c

taskstats: add e/u/stime for TGID command

2017-05-08 17:15:12 -07:00

test_kprobes.c

kernel/test_kprobes.c: use current logging functions

2014-08-08 15:57:18 -07:00

torture.c

torture: Fix typo suppressing CPU-hotplug statistics

2017-07-25 13:04:45 -07:00

tracepoint.c

tracepoint: Do not warn on ENOMEM

2018-05-09 09:51:50 +02:00

tsacct.c

sched/headers: Prepare to move cputime functionality from <linux/sched.h> into <linux/sched/cputime.h>

2017-03-02 08:42:39 +01:00

ucount.c

ucount: Remove the atomicity from ucount->count

2017-03-06 15:26:37 -06:00

uid16.c

kernel: make groups_sort calling a responsibility group_info allocators

2017-12-20 10:10:18 +01:00

umh.c

kmod: split out umh code into its own file

2017-09-08 18:26:50 -07:00

up.c

smp: Avoid using two cache lines for struct call_single_data

2017-08-29 15:14:38 +02:00

user_namespace.c

userns: move user access out of the mutex

2018-09-09 19:56:00 +02:00

user-return-notifier.c

scheduler: Replace __get_cpu_var with this_cpu_ptr

2014-08-26 13:45:45 -04:00

user.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/user.h>

2017-03-02 08:42:29 +01:00

utsname_sysctl.c

sys: don't hold uts_sem while accessing userspace memory

2018-09-09 19:56:00 +02:00

utsname.c

sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h>

2017-03-02 08:42:38 +01:00

watchdog_hld.c

watchdog: Mark watchdog touch functions as notrace

2018-09-05 09:26:42 +02:00

watchdog.c

watchdog: Mark watchdog touch functions as notrace

2018-09-05 09:26:42 +02:00

workqueue_internal.h

Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2017-11-06 12:26:49 -08:00

workqueue.c

watchdog: Mark watchdog touch functions as notrace

2018-09-05 09:26:42 +02:00