Skip to content

Commit 8c1318e

Browse files
committed
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
2 parents febf9ee + 6d2ed65 commit 8c1318e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Documentation/bpf/prog_lsm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LSM hook:
1818
.. c:function:: int file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, unsigned long prot);
1919
2020
Other LSM hooks which can be instrumented can be found in
21-
``include/linux/lsm_hooks.h``.
21+
``security/security.c``.
2222
2323
eBPF programs that use Documentation/bpf/btf.rst do not need to include kernel
2424
headers for accessing information from the attached eBPF program's context.

Documentation/security/lsm-development.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ that end users and distros can make a more informed decision about which
1111
LSMs suit their requirements.
1212

1313
For extensive documentation on the available LSM hook interfaces, please
14-
see ``include/linux/lsm_hooks.h`` and associated structures:
14+
see ``security/security.c`` and associated structures:
1515

16-
.. kernel-doc:: include/linux/lsm_hooks.h
17-
:internal:
16+
.. kernel-doc:: security/security.c
17+
:export:

Documentation/security/lsm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ associate these values with real security attributes.
9898
LSM hooks are maintained in lists. A list is maintained for each
9999
hook, and the hooks are called in the order specified by CONFIG_LSM.
100100
Detailed documentation for each hook is
101-
included in the `include/linux/lsm_hooks.h` header file.
101+
included in the `security/security.c` source file.
102102

103103
The LSM framework provides for a close approximation of
104104
general security module stacking. It defines

0 commit comments

Comments
 (0)