[PATCH] security/loadpin: Update the changing interface in the source code.

[PATCH] security/loadpin: Update the changing interface in the source code.

[Jiele zhao]

Loadpin cmdline interface "enabled" has been renamed to "enforce"
for a long time, but the User Description Document was not updated.
(Meaning unchanged)

And kernel_read_file* were moved from linux/fs.h to its own
linux/kernel_read_file.h include file. So update that change here.

Signed-off-by: Jiele zhao <unclexiaole@gmail.com>
---
 Documentation/admin-guide/LSM/LoadPin.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/admin-guide/LSM/LoadPin.rst b/Documentation/admin-guide/LSM/LoadPin.rst
index 716ad9b23c9a..dd3ca68b5df1 100644
--- a/Documentation/admin-guide/LSM/LoadPin.rst
+++ b/Documentation/admin-guide/LSM/LoadPin.rst
@@ -11,8 +11,8 @@ restrictions without needing to sign the files individually.
 
 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.enforce``". By default, it is enabled, but can be disabled at
+boot ("``loadpin.enforce=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
@@ -28,4 +28,4 @@ different mechanisms such as ``CONFIG_MODULE_SIG`` and
 ``CONFIG_KEXEC_VERIFY_SIG`` to verify kernel module and kernel image while
 still use LoadPin to protect the integrity of other files kernel loads. The
 full list of valid file types can be found in ``kernel_read_file_str``
-defined in ``include/linux/fs.h``.
+defined in ``include/linux/kernel_read_file.h``.
-- 
2.25.1

Re: [PATCH] security/loadpin: Update the changing interface in the source code.

[Jiele Zhao]

On 2021/3/8 10:03, Jiele zhao wrote:
> Loadpin cmdline interface "enabled" has been renamed to "enforce"
> for a long time, but the User Description Document was not updated.
> (Meaning unchanged)
>
> And kernel_read_file* were moved from linux/fs.h to its own
> linux/kernel_read_file.h include file. So update that change here.
>
> Signed-off-by: Jiele zhao <unclexiaole@gmail.com>
> ---
>   Documentation/admin-guide/LSM/LoadPin.rst | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/admin-guide/LSM/LoadPin.rst b/Documentation/admin-guide/LSM/LoadPin.rst
> index 716ad9b23c9a..dd3ca68b5df1 100644
> --- a/Documentation/admin-guide/LSM/LoadPin.rst
> +++ b/Documentation/admin-guide/LSM/LoadPin.rst
> @@ -11,8 +11,8 @@ restrictions without needing to sign the files individually.
>   
>   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.enforce``". By default, it is enabled, but can be disabled at
> +boot ("``loadpin.enforce=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
> @@ -28,4 +28,4 @@ different mechanisms such as ``CONFIG_MODULE_SIG`` and
>   ``CONFIG_KEXEC_VERIFY_SIG`` to verify kernel module and kernel image while
>   still use LoadPin to protect the integrity of other files kernel loads. The
>   full list of valid file types can be found in ``kernel_read_file_str``
> -defined in ``include/linux/fs.h``.
> +defined in ``include/linux/kernel_read_file.h``.

Ping. It's been almost one week now, can someone respond this patch?
Kees? Jonathan?

Re: [PATCH] security/loadpin: Update the changing interface in the source code.

[Jonathan Corbet]

Jiele zhao <unclexiaole@gmail.com> writes:

> Loadpin cmdline interface "enabled" has been renamed to "enforce"
> for a long time, but the User Description Document was not updated.
> (Meaning unchanged)
>
> And kernel_read_file* were moved from linux/fs.h to its own
> linux/kernel_read_file.h include file. So update that change here.
>
> Signed-off-by: Jiele zhao <unclexiaole@gmail.com>
> ---
>  Documentation/admin-guide/LSM/LoadPin.rst | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

This all looks correct as far as I can tell, so I've applied the patch.

Thanks,

jon

Re: [PATCH] security/loadpin: Update the changing interface in the source code.

[Kees Cook]

On Mon, Mar 08, 2021 at 02:03:58AM +0000, Jiele zhao wrote:
> Loadpin cmdline interface "enabled" has been renamed to "enforce"
> for a long time, but the User Description Document was not updated.
> (Meaning unchanged)
> 
> And kernel_read_file* were moved from linux/fs.h to its own
> linux/kernel_read_file.h include file. So update that change here.
> 
> Signed-off-by: Jiele zhao <unclexiaole@gmail.com>

Thanks for the catch!

Acked-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  Documentation/admin-guide/LSM/LoadPin.rst | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/admin-guide/LSM/LoadPin.rst b/Documentation/admin-guide/LSM/LoadPin.rst
> index 716ad9b23c9a..dd3ca68b5df1 100644
> --- a/Documentation/admin-guide/LSM/LoadPin.rst
> +++ b/Documentation/admin-guide/LSM/LoadPin.rst
> @@ -11,8 +11,8 @@ restrictions without needing to sign the files individually.
>  
>  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.enforce``". By default, it is enabled, but can be disabled at
> +boot ("``loadpin.enforce=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
> @@ -28,4 +28,4 @@ different mechanisms such as ``CONFIG_MODULE_SIG`` and
>  ``CONFIG_KEXEC_VERIFY_SIG`` to verify kernel module and kernel image while
>  still use LoadPin to protect the integrity of other files kernel loads. The
>  full list of valid file types can be found in ``kernel_read_file_str``
> -defined in ``include/linux/fs.h``.
> +defined in ``include/linux/kernel_read_file.h``.
> -- 
> 2.25.1
> 

-- 
Kees Cook