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

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
...@@ -18,7 +18,7 @@ LSM hook: ...@@ -18,7 +18,7 @@ LSM hook:
.. c:function:: int file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, unsigned long prot); .. 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 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 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. headers for accessing information from the attached eBPF program's context.
......
...@@ -11,7 +11,7 @@ that end users and distros can make a more informed decision about which ...@@ -11,7 +11,7 @@ that end users and distros can make a more informed decision about which
LSMs suit their requirements. LSMs suit their requirements.
For extensive documentation on the available LSM hook interfaces, please 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 .. kernel-doc:: security/security.c
:internal: :export:
...@@ -98,7 +98,7 @@ associate these values with real security attributes. ...@@ -98,7 +98,7 @@ associate these values with real security attributes.
LSM hooks are maintained in lists. A list is maintained for each 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. hook, and the hooks are called in the order specified by CONFIG_LSM.
Detailed documentation for each hook is 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 The LSM framework provides for a close approximation of
general security module stacking. It defines general security module stacking. It defines
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment