Merge tag ‘fsnotify_for_v5.1-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs [Linux 5.1]

Merge tag ‘fsnotify_for_v5.1-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs [Linux 5.1]

This Linux kernel change "Merge tag ‘fsnotify_for_v5.1-rc8’ of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Tue Apr 30 15:03:00 2019 -0700. The commit for this change in Linux stable tree is f2bc9c9 (patch). Other info about this change: Merge: bf3bd96 b1da6a5

Merge tag 'fsnotify_for_v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull fsnotify fix from Jan Kara:
 "A fix of user trigerable NULL pointer dereference syzbot has recently
  spotted.

  The problem was introduced in this merge window so no CC stable is
  needed"

* tag 'fsnotify_for_v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fsnotify: Fix NULL ptr deref in fanotify_get_fsid()

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 *