1. 01 6月, 2021 19 次提交
  2. 24 5月, 2021 18 次提交
  3. 23 5月, 2021 3 次提交
    • L
      Merge tag 'kbuild-fixes-v5.13' of... · 4d762034
      Linus Torvalds 提交于
      Merge tag 'kbuild-fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
      
       - Fix short log indentation for tools builds
      
       - Fix dummy-tools to adjust to the latest stackprotector check
      
      * tag 'kbuild-fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: dummy-tools: adjust to stricter stackprotector check
        scripts/jobserver-exec: Fix a typo ("envirnoment")
        tools build: Fix quiet cmd indentation
      4d762034
    • L
      Merge branch 'akpm' (patches from Andrew) · 34c5c898
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "10 patches.
      
        Subsystems affected by this patch series: mm (pagealloc, gup, kasan,
        and userfaultfd), ipc, selftests, watchdog, bitmap, procfs, and lib"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        userfaultfd: hugetlbfs: fix new flag usage in error path
        lib: kunit: suppress a compilation warning of frame size
        proc: remove Alexey from MAINTAINERS
        linux/bits.h: fix compilation error with GENMASK
        watchdog: reliable handling of timestamps
        kasan: slab: always reset the tag in get_freepointer_safe()
        tools/testing/selftests/exec: fix link error
        ipc/mqueue, msg, sem: avoid relying on a stack reference past its expiry
        Revert "mm/gup: check page posion status for coredump."
        mm/shuffle: fix section mismatch warning
      34c5c898
    • M
      userfaultfd: hugetlbfs: fix new flag usage in error path · e32905e5
      Mike Kravetz 提交于
      In commit d6995da3 ("hugetlb: use page.private for hugetlb specific
      page flags") the use of PagePrivate to indicate a reservation count
      should be restored at free time was changed to the hugetlb specific flag
      HPageRestoreReserve.  Changes to a userfaultfd error path as well as a
      VM_BUG_ON() in remove_inode_hugepages() were overlooked.
      
      Users could see incorrect hugetlb reserve counts if they experience an
      error with a UFFDIO_COPY operation.  Specifically, this would be the
      result of an unlikely copy_huge_page_from_user error.  There is not an
      increased chance of hitting the VM_BUG_ON.
      
      Link: https://lkml.kernel.org/r/20210521233952.236434-1-mike.kravetz@oracle.com
      Fixes: d6995da3 ("hugetlb: use page.private for hugetlb specific page flags")
      Signed-off-by: NMike Kravetz <mike.kravetz@oracle.com>
      Reviewed-by: NMina Almasry <almasry.mina@google.com>
      Cc: Oscar Salvador <osalvador@suse.de>
      Cc: Michal Hocko <mhocko@suse.com>
      Cc: Muchun Song <songmuchun@bytedance.com>
      Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Cc: David Hildenbrand <david@redhat.com>
      Cc: Matthew Wilcox <willy@infradead.org>
      Cc: Miaohe Lin <linmiaohe@huawei.com>
      Cc: Mina Almasry <almasrymina@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e32905e5