]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
Merge tag 'lsm-pr-20240923' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Sep 2024 17:18:15 +0000 (10:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Sep 2024 17:18:15 +0000 (10:18 -0700)
Pull LSM fixes from Paul Moore:

 - Add a missing security_mmap_file() check to the remap_file_pages()
   syscall

 - Properly reference the SELinux and Smack LSM blobs in the
   security_watch_key() LSM hook

 - Fix a random IPE selftest crash caused by a missing list terminator
   in the test

* tag 'lsm-pr-20240923' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  ipe: Add missing terminator to list of unit tests
  selinux,smack: properly reference the LSM blob in security_watch_key()
  mm: call the security_mmap_file() LSM hook in remap_file_pages()

1  2 
mm/mmap.c
security/selinux/hooks.c
security/smack/smack_lsm.c

diff --cc mm/mmap.c
Simple merge
Simple merge
Simple merge