Messages in this thread | | | Date | Thu, 22 Oct 2020 07:01:28 +0100 | From | Al Viro <> | Subject | [git pull] vfs.git set_fs pile |
| |
Christoph's set_fs base series + fixups. A few trivial conflicts (arch/{ia64,m68k/s390}/Kconfig and arch/x86/lib/getuser.S); proposed resolution in #merge-candidate, same as in -next.
The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5:
Linux 5.9-rc1 (2020-08-16 13:04:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git work.set_fs
for you to fetch changes up to 7b84b665c874f60d84547635341e418f20cbbab2:
fs: Allow a NULL pos pointer to __kernel_read (2020-10-15 14:20:42 -0400)
---------------------------------------------------------------- Christoph Hellwig (13): proc: remove a level of indentation in proc_get_inode proc: cleanup the compat vs no compat file ops proc: add a read_iter method to proc proc_ops fs: don't allow kernel reads and writes without iter ops fs: don't allow splice read/write without explicit ops uaccess: add infrastructure for kernel builds with set_fs() test_bitmap: remove user bitmap tests lkdtm: remove set_fs-based tests x86: move PAGE_OFFSET, TASK_SIZE & friends to page_{32,64}_types.h x86: make TASK_SIZE_MAX usable from assembly code x86: remove address space overrides using set_fs() powerpc: use non-set_fs based maccess routines powerpc: remove address space overrides using set_fs()
Matthew Wilcox (Oracle) (3): sysctl: Convert to iter interfaces fs: Allow a NULL pos pointer to __kernel_write fs: Allow a NULL pos pointer to __kernel_read
arch/Kconfig | 3 + arch/alpha/Kconfig | 1 + arch/arc/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/c6x/Kconfig | 1 + arch/csky/Kconfig | 1 + arch/h8300/Kconfig | 1 + arch/hexagon/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nds32/Kconfig | 1 + arch/nios2/Kconfig | 1 + arch/openrisc/Kconfig | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/include/asm/processor.h | 7 -- arch/powerpc/include/asm/thread_info.h | 5 +- arch/powerpc/include/asm/uaccess.h | 67 ++++++---------- arch/powerpc/kernel/signal.c | 3 - arch/powerpc/lib/sstep.c | 6 +- arch/riscv/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/um/Kconfig | 1 + arch/x86/ia32/ia32_aout.c | 1 - arch/x86/include/asm/page_32_types.h | 11 +++ arch/x86/include/asm/page_64_types.h | 38 ++++++++++ arch/x86/include/asm/processor.h | 60 +-------------- arch/x86/include/asm/thread_info.h | 2 - arch/x86/include/asm/uaccess.h | 26 +------ arch/x86/kernel/asm-offsets.c | 3 - arch/x86/lib/getuser.S | 47 ++++++------ arch/x86/lib/putuser.S | 25 +++--- arch/xtensa/Kconfig | 1 + drivers/misc/lkdtm/bugs.c | 10 --- drivers/misc/lkdtm/core.c | 2 - drivers/misc/lkdtm/lkdtm.h | 2 - drivers/misc/lkdtm/usercopy.c | 15 ---- fs/proc/inode.c | 119 ++++++++++++++++++++--------- fs/proc/proc_sysctl.c | 48 ++++++------ fs/read_write.c | 71 ++++++++++------- fs/splice.c | 130 ++++---------------------------- include/linux/bpf-cgroup.h | 2 +- include/linux/fs.h | 2 - include/linux/proc_fs.h | 1 + include/linux/uaccess.h | 18 +++++ kernel/bpf/cgroup.c | 2 +- lib/test_bitmap.c | 91 ++++++---------------- tools/testing/selftests/lkdtm/tests.txt | 2 - 52 files changed, 346 insertions(+), 495 deletions(-)
| |