Commit 8c1318e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'lsm-pr-20230428' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm 

Pull lsm fix from Paul Moore:
 "A single Documentation/LSM fix to update the LSM hook documentation
  references from lsm_hooks.h to security.c"

* tag 'lsm-pr-20230428' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  lsm: move hook comments docs to security/security.c
parents febf9ee3 6d2ed653

Documentation/bpf/prog_lsm.rst

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LSM hook: 
.. c:function:: int file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, unsigned long prot);



Other LSM hooks which can be instrumented can be found in

``include/linux/lsm_hooks.h``.

``security/security.c``.



eBPF programs that use Documentation/bpf/btf.rst do not need to include kernel

headers for accessing information from the attached eBPF program's context.

Documentation/security/lsm-development.rst

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ that end users and distros can make a more informed decision about which 
LSMs suit their requirements.



For extensive documentation on the available LSM hook interfaces, please

see ``include/linux/lsm_hooks.h`` and associated structures:

see ``security/security.c`` and associated structures:



.. kernel-doc:: include/linux/lsm_hooks.h

   :internal:
 
.. kernel-doc:: security/security.c

   :export:

Documentation/security/lsm.rst

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ associate these values with real security attributes. 
LSM hooks are maintained in lists. A list is maintained for each

hook, and the hooks are called in the order specified by CONFIG_LSM.

Detailed documentation for each hook is

included in the `include/linux/lsm_hooks.h` header file.

included in the `security/security.c` source file.



The LSM framework provides for a close approximation of

general security module stacking. It defines