[PATCH] Docs: Update LSM/apparmor.rst

[PATCH] Docs: Update LSM/apparmor.rst

[Siddharth Menon]

    Docs: Update LSM/apparmor.rst
    
    Update AppArmor documentation after deprication of CONFIG_DEFAULT_SECURITY to enable and configuring AppArmor.
    
    Signed-off-by: Siddharth Menon <simeddon@gmail.com>

Signed-off-by: Siddharth Menon <simeddon@gmail.com>
---
 Documentation/admin-guide/LSM/apparmor.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/admin-guide/LSM/apparmor.rst b/Documentation/admin-guide/LSM/apparmor.rst
index 6cf81bbd7ce8..f324d750468a 100644
--- a/Documentation/admin-guide/LSM/apparmor.rst
+++ b/Documentation/admin-guide/LSM/apparmor.rst
@@ -18,8 +18,10 @@ set ``CONFIG_SECURITY_APPARMOR=y``
 
 If AppArmor should be selected as the default security module then set::
 
-   CONFIG_DEFAULT_SECURITY="apparmor"
-   CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+   CONFIG_DEFAULT_SECURITY_APPARMOR=y
+
+Since kernel 5.0, `CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE` is no longer used. 
+Instead, the `CONFIG_LSM` parameter manages the order and selection of LSMs.
 
 Build the kernel
 
-- 
2.39.2

Re: [PATCH] Docs: Update LSM/apparmor.rst

[Jonathan Corbet]

Hi, Siddharth, thanks for working to make our documentation better!

I do have a few comments, needless to say...:)

First is that you always need to send a patch to the appropriate
maintainers; scripts/get_maintainer.pl will help you there.

Siddharth Menon <simeddon@gmail.com> writes:

>     Docs: Update LSM/apparmor.rst
>     
>     Update AppArmor documentation after deprication of CONFIG_DEFAULT_SECURITY to enable and configuring AppArmor.

Please try to stick to the 80-column limit whenever you can.  Also,
"deprecation".

>     Signed-off-by: Siddharth Menon <simeddon@gmail.com>
>
> Signed-off-by: Siddharth Menon <simeddon@gmail.com>
> ---
>  Documentation/admin-guide/LSM/apparmor.rst | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/admin-guide/LSM/apparmor.rst b/Documentation/admin-guide/LSM/apparmor.rst
> index 6cf81bbd7ce8..f324d750468a 100644
> --- a/Documentation/admin-guide/LSM/apparmor.rst
> +++ b/Documentation/admin-guide/LSM/apparmor.rst
> @@ -18,8 +18,10 @@ set ``CONFIG_SECURITY_APPARMOR=y``
>  
>  If AppArmor should be selected as the default security module then set::
>  
> -   CONFIG_DEFAULT_SECURITY="apparmor"
> -   CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
> +   CONFIG_DEFAULT_SECURITY_APPARMOR=y
> +
> +Since kernel 5.0, `CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE` is no longer used. 
> +Instead, the `CONFIG_LSM` parameter manages the order and selection of LSMs.

The documentation covers the current state of the kernel, so we do not
normally put historical information like that.  Best to just describe
how things work now.

Thanks,

jon