Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1640897

[PATCH 12/17] doc: ReSTify LoadPin.txt

Show all headers | View raw

Adjusts for ReST markup and moves under LSM admin guide.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 .../{security/LoadPin.txt => admin-guide/LSM/LoadPin.rst}    | 12 ++++++++----
 Documentation/admin-guide/LSM/index.rst                      |  1 +
 MAINTAINERS                                                  |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)
 rename Documentation/{security/LoadPin.txt => admin-guide/LSM/LoadPin.rst} (73%)

diff --git a/Documentation/security/LoadPin.txt b/Documentation/admin-guide/LSM/LoadPin.rst
similarity index 73%
rename from Documentation/security/LoadPin.txt
rename to Documentation/admin-guide/LSM/LoadPin.rst
index e11877f5d3d4..32070762d24c 100644
--- a/Documentation/security/LoadPin.txt
+++ b/Documentation/admin-guide/LSM/LoadPin.rst
@@ -1,3 +1,7 @@
+=======
+LoadPin
+=======
+
 LoadPin is a Linux Security Module that ensures all kernel-loaded files
 (modules, firmware, etc) all originate from the same filesystem, with
 the expectation that such a filesystem is backed by a read-only device
@@ -5,13 +9,13 @@ such as dm-verity or CDROM. This allows systems that have a verified
 and/or unchangeable filesystem to enforce module and firmware loading
 restrictions without needing to sign the files individually.
 
-The LSM is selectable at build-time with CONFIG_SECURITY_LOADPIN, and
+The LSM is selectable at build-time with ``CONFIG_SECURITY_LOADPIN``, and
 can be controlled at boot-time with the kernel command line option
-"loadpin.enabled". By default, it is enabled, but can be disabled at
-boot ("loadpin.enabled=0").
+"``loadpin.enabled``". By default, it is enabled, but can be disabled at
+boot ("``loadpin.enabled=0``").
 
 LoadPin starts pinning when it sees the first file loaded. If the
 block device backing the filesystem is not read-only, a sysctl is
-created to toggle pinning: /proc/sys/kernel/loadpin/enabled. (Having
+created to toggle pinning: ``/proc/sys/kernel/loadpin/enabled``. (Having
 a mutable filesystem means pinning is mutable too, but having the
 sysctl allows for easy testing on systems with a mutable filesystem.)
diff --git a/Documentation/admin-guide/LSM/index.rst b/Documentation/admin-guide/LSM/index.rst
index e5ba2c69b8ef..41f5262359f9 100644
--- a/Documentation/admin-guide/LSM/index.rst
+++ b/Documentation/admin-guide/LSM/index.rst
@@ -34,6 +34,7 @@ the one "major" module (e.g. SELinux) if there is one configured.
    :maxdepth: 1
 
    apparmor
+   LoadPin
    SELinux
    tomoyo
    Yama
diff --git a/MAINTAINERS b/MAINTAINERS
index c72830e888f1..3c1560c75aa6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11567,6 +11567,7 @@ M:	Kees Cook <keescook@chromium.org>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
 S:	Supported
 F:	security/loadpin/
+F:	Documentation/admin-guide/LSM/LoadPin.rst
 
 YAMA SECURITY MODULE
 M:	Kees Cook <keescook@chromium.org>
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/17] convert/reorganize Documentation/security/ Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 16/17] doc: ReSTify keys-request-key.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 04/17] doc: ReSTify credentials.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 06/17] doc: security: minor cleanups to build kernel-doc Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
    Re: [PATCH 06/17] doc: security: minor cleanups to build  kernel-doc James Morris <jmorris@namei.org> - 2017-05-15 01:20 +0200
      Re: [PATCH 06/17] doc: security: minor cleanups to build kernel-doc Jonathan Corbet <corbet@lwn.net> - 2017-05-15 19:30 +0200
    Re: [PATCH 06/17] doc: security: minor cleanups to build kernel-doc Casey Schaufler <casey@schaufler-ca.com> - 2017-05-15 02:10 +0200
      Re: [PATCH 06/17] doc: security: minor cleanups to build kernel-doc Kees Cook <keescook@chromium.org> - 2017-05-15 16:50 +0200
  [PATCH 12/17] doc: ReSTify LoadPin.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 17/17] doc: ReSTify keys-trusted-encrypted.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 05/17] doc: ReSTify self-protection.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 03/17] doc: ReSTify IMA-templates.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 02/17] doc: ReSTify no_new_privs.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 13/17] doc: ReSTify Smack.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
    Re: [PATCH 13/17] doc: ReSTify Smack.txt Casey Schaufler <casey@schaufler-ca.com> - 2017-05-15 16:20 +0200
  [PATCH 07/17] doc: ReSTify and split LSM.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
  [PATCH 09/17] doc: ReSTify apparmor.txt Kees Cook <keescook@chromium.org> - 2017-05-13 14:00 +0200
    Re: [PATCH 09/17] doc: ReSTify apparmor.txt John Johansen <john.johansen@canonical.com> - 2017-05-13 21:50 +0200
  Re: [PATCH 00/17] convert/reorganize Documentation/security/ Jonathan Corbet <corbet@lwn.net> - 2017-05-15 19:30 +0200
    Re: [PATCH 00/17] convert/reorganize Documentation/security/ Kees Cook <keescook@chromium.org> - 2017-05-15 19:40 +0200
  Re: [PATCH 00/17] convert/reorganize Documentation/security/ Jonathan Corbet <corbet@lwn.net> - 2017-05-18 19:00 +0200
    Re: [PATCH 00/17] convert/reorganize Documentation/security/ Kees Cook <keescook@chromium.org> - 2017-05-18 19:10 +0200

csiph-web