Merge tag ‘seccomp-v5.1-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux [Linux 5.1]

Merge tag ‘seccomp-v5.1-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux [Linux 5.1]

This Linux kernel change "Merge tag ‘seccomp-v5.1-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Mon Apr 29 13:24:34 2019 -0700. The commit for this change in Linux stable tree is 83a5084 (patch). Other info about this change: Merge: 8087148 7a0df7f

Merge tag 'seccomp-v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull seccomp fixes from Kees Cook:
 "Syzbot found a use-after-free bug in seccomp due to flags that should
  not be allowed to be used together.

  Tycho fixed this, I updated the self-tests, and the syzkaller PoC has
  been running for several days without triggering KASan (before this
  fix, it would reproduce). These patches have also been in -next for
  almost a week, just to be sure.

   - Add logic for making some seccomp flags exclusive (Tycho)

   - Update selftests for exclusivity testing (Kees)"

* tag 'seccomp-v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Make NEW_LISTENER and TSYNC flags exclusive
  selftests/seccomp: Prepare for exclusive seccomp flags

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/x86/include/asm/pgtable.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 2779ace..50b3e2d 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -46,7 +46,7 @@
  */
 extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
    __visible;
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
+#define ZERO_PAGE(vaddr) ((void)(vaddr),virt_to_page(empty_zero_page))

 extern spinlock_t pgd_lock;
 extern struct list_head pgd_list;

Leave a Reply

Your email address will not be published. Required fields are marked *