[PATCH 1/2] Documentation: seccomp: fix reST markup

[PATCH 1/2] Documentation: seccomp: fix reST markup

[Jakub Wilk]

Signed-off-by: Jakub Wilk <jwilk@jwilk.net>
---
 Documentation/userspace-api/seccomp_filter.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/userspace-api/seccomp_filter.rst b/Documentation/userspace-api/seccomp_filter.rst
index b1b846d8a094..0f09a63ea923 100644
--- a/Documentation/userspace-api/seccomp_filter.rst
+++ b/Documentation/userspace-api/seccomp_filter.rst
@@ -133,7 +133,7 @@ In precedence order, they are:
 	call.  If there is no tracer present, ``-ENOSYS`` is returned to
 	userland and the system call is not executed.
 
-	A tracer will be notified if it requests ``PTRACE_O_TRACESECCOM``P
+	A tracer will be notified if it requests ``PTRACE_O_TRACESECCOMP``
 	using ``ptrace(PTRACE_SETOPTIONS)``.  The tracer will be notified
 	of a ``PTRACE_EVENT_SECCOMP`` and the ``SECCOMP_RET_DATA`` portion of
 	the BPF program return value will be available to the tracer
-- 
2.20.1

[PATCH 2/2] Documentation: seccomp: unify list indentation

[Jakub Wilk]

Use tabs to indent SECCOMP_RET_USER_NOTIF definition, for consistency
with other items in this list.

Signed-off-by: Jakub Wilk <jwilk@jwilk.net>
---
 Documentation/userspace-api/seccomp_filter.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/userspace-api/seccomp_filter.rst b/Documentation/userspace-api/seccomp_filter.rst
index 0f09a63ea923..bd9165241b6c 100644
--- a/Documentation/userspace-api/seccomp_filter.rst
+++ b/Documentation/userspace-api/seccomp_filter.rst
@@ -123,9 +123,9 @@ In precedence order, they are:
 	to userland as the errno without executing the system call.
 
 ``SECCOMP_RET_USER_NOTIF``:
-    Results in a ``struct seccomp_notif`` message sent on the userspace
-    notification fd, if it is attached, or ``-ENOSYS`` if it is not. See below
-    on discussion of how to handle user notifications.
+	Results in a ``struct seccomp_notif`` message sent on the userspace
+	notification fd, if it is attached, or ``-ENOSYS`` if it is not. See
+	below on discussion of how to handle user notifications.
 
 ``SECCOMP_RET_TRACE``:
 	When returned, this value will cause the kernel to attempt to
-- 
2.20.1

Re: [PATCH 1/2] Documentation: seccomp: fix reST markup

[Kees Cook]

On Mon, Mar 4, 2019 at 12:32 PM Jakub Wilk <jwilk@jwilk.net> wrote:
>
> Signed-off-by: Jakub Wilk <jwilk@jwilk.net>

Hah, whoops. Thanks!

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

-Kees

> ---
>  Documentation/userspace-api/seccomp_filter.rst | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/userspace-api/seccomp_filter.rst b/Documentation/userspace-api/seccomp_filter.rst
> index b1b846d8a094..0f09a63ea923 100644
> --- a/Documentation/userspace-api/seccomp_filter.rst
> +++ b/Documentation/userspace-api/seccomp_filter.rst
> @@ -133,7 +133,7 @@ In precedence order, they are:
>         call.  If there is no tracer present, ``-ENOSYS`` is returned to
>         userland and the system call is not executed.
>
> -       A tracer will be notified if it requests ``PTRACE_O_TRACESECCOM``P
> +       A tracer will be notified if it requests ``PTRACE_O_TRACESECCOMP``
>         using ``ptrace(PTRACE_SETOPTIONS)``.  The tracer will be notified
>         of a ``PTRACE_EVENT_SECCOMP`` and the ``SECCOMP_RET_DATA`` portion of
>         the BPF program return value will be available to the tracer
> --
> 2.20.1
>


-- 
Kees Cook

Re: [PATCH 2/2] Documentation: seccomp: unify list indentation

[Kees Cook]

On Mon, Mar 4, 2019 at 12:32 PM Jakub Wilk <jwilk@jwilk.net> wrote:
>
> Use tabs to indent SECCOMP_RET_USER_NOTIF definition, for consistency
> with other items in this list.
>
> Signed-off-by: Jakub Wilk <jwilk@jwilk.net>

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

-Kees

> ---
>  Documentation/userspace-api/seccomp_filter.rst | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/userspace-api/seccomp_filter.rst b/Documentation/userspace-api/seccomp_filter.rst
> index 0f09a63ea923..bd9165241b6c 100644
> --- a/Documentation/userspace-api/seccomp_filter.rst
> +++ b/Documentation/userspace-api/seccomp_filter.rst
> @@ -123,9 +123,9 @@ In precedence order, they are:
>         to userland as the errno without executing the system call.
>
>  ``SECCOMP_RET_USER_NOTIF``:
> -    Results in a ``struct seccomp_notif`` message sent on the userspace
> -    notification fd, if it is attached, or ``-ENOSYS`` if it is not. See below
> -    on discussion of how to handle user notifications.
> +       Results in a ``struct seccomp_notif`` message sent on the userspace
> +       notification fd, if it is attached, or ``-ENOSYS`` if it is not. See
> +       below on discussion of how to handle user notifications.
>
>  ``SECCOMP_RET_TRACE``:
>         When returned, this value will cause the kernel to attempt to
> --
> 2.20.1
>


-- 
Kees Cook

Re: [PATCH 2/2] Documentation: seccomp: unify list indentation

[Jonathan Corbet]

On Mon,  4 Mar 2019 21:31:52 +0100
Jakub Wilk <jwilk@jwilk.net> wrote:

> Use tabs to indent SECCOMP_RET_USER_NOTIF definition, for consistency
> with other items in this list.
> 
> Signed-off-by: Jakub Wilk <jwilk@jwilk.net>

Both patches applied, thanks.

jon