Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from torvalds:master #51

Merged
merged 28 commits into from
Jun 11, 2020
Merged

[pull] master from torvalds:master #51

merged 28 commits into from
Jun 11, 2020

Commits on May 2, 2020

  1. i915: switch query_{topology,engine}_info() to copy_to_user()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 2, 2020
    Configuration menu
    Copy the full SHA
    516431a View commit details
    Browse the repository at this point in the history
  2. i915: switch copy_perf_config_registers_or_number() to unsafe_put_user()

    ... and the rest of query_perf_config_data() to normal uaccess primitives
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 2, 2020
    Configuration menu
    Copy the full SHA
    502f78c View commit details
    Browse the repository at this point in the history
  3. i915 compat ioctl(): just use drm_ioctl_kernel()

    compat_alloc_user_space() is a bad kludge; the sooner it goes, the
    better...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 2, 2020
    Configuration menu
    Copy the full SHA
    fd7cd8d View commit details
    Browse the repository at this point in the history
  4. i915: alloc_oa_regs(): get rid of pointless access_ok()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 2, 2020
    Configuration menu
    Copy the full SHA
    598caf1 View commit details
    Browse the repository at this point in the history
  5. i915:get_engines(): get rid of pointless access_ok()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 2, 2020
    Configuration menu
    Copy the full SHA
    7b3f0c4 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. eventfd: convert to f_op->read_iter()

    eventfd is using ->read() as it's file_operations read handler, but
    this prevents passing in information about whether a given IO operation
    is blocking or not. We can only use the file flags for that. To support
    async (-EAGAIN/poll based) retries for io_uring, we need ->read_iter()
    support. Convert eventfd to using ->read_iter().
    
    With ->read_iter(), we can support IOCB_NOWAIT. Ensure the fd setup
    is done such that we set file->f_mode with FMODE_NOWAIT.
    
    [missing include added]
    
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    axboe authored and Al Viro committed May 7, 2020
    Configuration menu
    Copy the full SHA
    12aceb8 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. vfs: Remove duplicated d_mountpoint check in __is_local_mountpoint

    This function acts as an out-of-line helper for is_local_mountpoint
    is only called after the latter verifies the dentry is not a mountpoint.
    There's no semantic changes and the resulting object code is smaller:
    
    add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-26 (-26)
    Function                                     old     new   delta
    __is_local_mountpoint                        147     121     -26
    Total: Before=34161, After=34135, chg -0.08%
    
    Signed-off-by: Nikolay Borisov <nborisov@suse.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    lorddoskias authored and Al Viro committed May 29, 2020
    Configuration menu
    Copy the full SHA
    5ad05cc View commit details
    Browse the repository at this point in the history
  2. fs: fix indentation in deactivate_super()

    Fix the breaked indent in deactive_super().
    
    Signed-off-by: Yufen Yu <yuyufen@huawei.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Yufen Yu authored and Al Viro committed May 29, 2020
    Configuration menu
    Copy the full SHA
    cc23402 View commit details
    Browse the repository at this point in the history
  3. pselect6() and friends: take handling the combined 6th/7th args into …

    …helper
    
    ... and use unsafe_get_user(), while we are at it.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 29, 2020
    Configuration menu
    Copy the full SHA
    7e71609 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. binfmt_elf: don't bother with __{put,copy_to}_user()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    646e84d View commit details
    Browse the repository at this point in the history
  2. binfmt_elf_fdpic: don't use __... uaccess primitives

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    0abb013 View commit details
    Browse the repository at this point in the history
  3. binfmt_flat: don't use __put_user()

    ... and check the return value
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    8861fd5 View commit details
    Browse the repository at this point in the history
  4. x86: switch cp_stat64() to unsafe_put_user()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    c120f3b View commit details
    Browse the repository at this point in the history
  5. TEST_ACCESS_OK _never_ had been checked anywhere

    Once upon a time the predecessor of that thing (TEST_VERIFY_AREA)
    used to be.  However, that had been gone for years now (and
    the patch that introduced TEST_ACCESS_OK has not touched any
    ifdefs - they got gradually removed later).  Just bury it...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    86977da View commit details
    Browse the repository at this point in the history
  6. user_regset_copyout_zero(): use clear_user()

    that's the only caller of __clear_user() in generic code, and it's
    not hot enough to bother with skipping access_ok().
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    5ea75ae View commit details
    Browse the repository at this point in the history
  7. x86: kvm_hv_set_msr(): use __put_user() instead of 32bit __clear_user()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    9eb41c5 View commit details
    Browse the repository at this point in the history
  8. bpf: make bpf_check_uarg_tail_zero() use check_zeroed_user()

    ... rather than open-coding it, and badly, at that.
    
    Acked-by: Alexei Starovoitov <ast@kernel.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    b7e4b65 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. net/sysctl: use cpumask_parse in flow_limit_cpu_sysctl

    cpumask_parse_user works on __user pointers, so this is wrong now.
    
    Fixes: 3292739 ("sysctl: pass kernel pointers to ->proc_handler")
    Reported-by: build test robot <lkp@intel.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Christoph Hellwig authored and Al Viro committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    56965ac View commit details
    Browse the repository at this point in the history
  2. net/sysctl: remove leftover __user annotations on neigh_proc_dointvec*

    Remove the leftover __user annotation on the prototypes for
    neigh_proc_dointvec*.  The implementations already got this right, but
    the headers kept the __user tags around.
    
    Fixes: 3292739 ("sysctl: pass kernel pointers to ->proc_handler")
    Reported-by: build test robot <lkp@intel.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Christoph Hellwig authored and Al Viro committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    c7388c1 View commit details
    Browse the repository at this point in the history
  3. random: fix an incorrect __user annotation on proc_do_entropy

    No user pointers for sysctls anymore.
    
    Fixes: 3292739 ("sysctl: pass kernel pointers to ->proc_handler")
    Reported-by: build test robot <lkp@intel.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Christoph Hellwig authored and Al Viro committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    a2541dc View commit details
    Browse the repository at this point in the history
  4. trace: fix an incorrect __user annotation on stack_trace_sysctl

    No user pointers for sysctls anymore.
    
    Fixes: 3292739 ("sysctl: pass kernel pointers to ->proc_handler")
    Reported-by: build test robot <lkp@intel.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Christoph Hellwig authored and Al Viro committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    7ff0d44 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. cdrom: fix an incorrect __user annotation on cdrom_sysctl_info

    No user pointers for sysctls anymore.
    
    Fixes: 3292739 ("sysctl: pass kernel pointers to ->proc_handler")
    Reported-by: build test robot <lkp@intel.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Christoph Hellwig authored and Al Viro committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    8c46fa9 View commit details
    Browse the repository at this point in the history
  2. sysctl: reject gigantic reads/write to sysctl files

    Instead of triggering a WARN_ON deep down in the page allocator just
    give up early on allocations that are way larger than the usual sysctl
    values.
    
    Fixes: 3292739 ("sysctl: pass kernel pointers to ->proc_handler")
    Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Christoph Hellwig authored and Al Viro committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    ef9d965 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/viro/vfs
    
    Pull misc uaccess updates from Al Viro:
     "Assorted uaccess patches for this cycle - the stuff that didn't fit
      into thematic series"
    
    * 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      bpf: make bpf_check_uarg_tail_zero() use check_zeroed_user()
      x86: kvm_hv_set_msr(): use __put_user() instead of 32bit __clear_user()
      user_regset_copyout_zero(): use clear_user()
      TEST_ACCESS_OK _never_ had been checked anywhere
      x86: switch cp_stat64() to unsafe_put_user()
      binfmt_flat: don't use __put_user()
      binfmt_elf_fdpic: don't use __... uaccess primitives
      binfmt_elf: don't bother with __{put,copy_to}_user()
      pselect6() and friends: take handling the combined 6th/7th args into helper
    torvalds committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    4382a79 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'uaccess.i915' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/viro/vfs
    
    Pull i915 uaccess updates from Al Viro:
     "Low-hanging fruit in i915; there are several trickier followups, but
      that'll wait for the next cycle"
    
    * 'uaccess.i915' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      i915:get_engines(): get rid of pointless access_ok()
      i915: alloc_oa_regs(): get rid of pointless access_ok()
      i915 compat ioctl(): just use drm_ioctl_kernel()
      i915: switch copy_perf_config_registers_or_number() to unsafe_put_user()
      i915: switch query_{topology,engine}_info() to copy_to_user()
    torvalds committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    3a8557e View commit details
    Browse the repository at this point in the history
  5. Merge branch 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/viro/vfs
    
    Pull sysctl fixes from Al Viro:
     "Fixups to regressions in sysctl series"
    
    * 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      sysctl: reject gigantic reads/write to sysctl files
      cdrom: fix an incorrect __user annotation on cdrom_sysctl_info
      trace: fix an incorrect __user annotation on stack_trace_sysctl
      random: fix an incorrect __user annotation on proc_do_entropy
      net/sysctl: remove leftover __user annotations on neigh_proc_dointvec*
      net/sysctl: use cpumask_parse in flow_limit_cpu_sysctl
    torvalds committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    1c38372 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs
    
    Pull vfs fixes from Al Viro:
     "A couple of trivial patches that fell through the cracks last cycle"
    
    * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      fs: fix indentation in deactivate_super()
      vfs: Remove duplicated d_mountpoint check in __is_local_mountpoint
    torvalds committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    4dbb29f View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Merge branch 'work.epoll' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/viro/vfs
    
    Pull epoll update from Al Viro:
     "epoll conversion to read_iter from Jens; I thought there might be more
      epoll stuff this cycle, but uaccess took too much time"
    
    * 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      eventfd: convert to f_op->read_iter()
    torvalds committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    b29482f View commit details
    Browse the repository at this point in the history