From: Sergey Nazarov <s-nazarov@yandex.ru>
To: Paul Moore <paul@paul-moore.com>
Cc: linux-kernel@vger.kernel.org, linux-audit@redhat.com,
Eric Paris <eparis@redhat.com>
Subject: Re: [PATCH] audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition
Date: Mon, 07 Jun 2021 12:58:13 +0300 [thread overview]
Message-ID: <79d5bffd63b46bb7d54ebcef4765cfca28f76ff0.camel@yandex.ru> (raw)
In-Reply-To: <CAHC9VhTvp3Z26JbXJdq8p4T7w3GZk-1CFWY328o75-AqqUbNTg@mail.gmail.com>
Hi, Paul!
I think this could be easer. It's enouth to rename AUDIT_DISABLE only.
enum audit_state deals with per-task syscalls audit context, so we can
use AUDIT_CONTEXT_DISABLED for example. If it's okay, I can send a new
patch version.
В Сб, 05/06/2021 в 22:40 -0400, Paul Moore пишет:
> On Fri, Jun 4, 2021 at 7:21 AM Sergey Nazarov <s-nazarov@yandex.ru>
> wrote:
> >
> > AUDIT_DISABLED defined in kernel/audit.h as element of enum
> > audit_state
> > and redefined in kernel/audit.c. This produces a warning when
> > kernel builds
> > with syscalls audit disabled and brokes kernel build if -Werror
> > used.
> > enum audit_state used in syscall audit code only. This patch
> > changes
> > enum audit_state constants prefix AUDIT to AUDITSC to avoid
> > AUDIT_DISABLED
> > redefinition.
> >
> > Signed-off-by: Sergey Nazarov <s-nazarov@yandex.ru>
> > ---
> > kernel/audit.h | 8 ++++----
> > kernel/auditsc.c | 34 +++++++++++++++++-----------------
> > 2 files changed, 21 insertions(+), 21 deletions(-)
>
> Hi Sergey,
>
> Thanks for sending a patch to fix this problem. One comment below
> ...
>
> > diff --git a/kernel/audit.h b/kernel/audit.h
> > index 1522e10..ee81f20 100644
> > --- a/kernel/audit.h
> > +++ b/kernel/audit.h
> > @@ -21,16 +21,16 @@
> > a per-task filter. At syscall entry, the audit_state is
> > augmented by
> > the syscall filter. */
> > enum audit_state {
> > - AUDIT_DISABLED, /* Do not create per-task
> > audit_context.
> > + AUDITSC_DISABLED, /* Do not create per-task
> > audit_context.
> > * No syscall-specific audit
> > records can
> > * be generated. */
> > - AUDIT_BUILD_CONTEXT, /* Create the per-task
> > audit_context,
> > + AUDITSC_BUILD_CONTEXT, /* Create the per-task
> > audit_context,
> > * and fill it in at syscall
> > * entry time. This makes a full
> > * syscall record available if some
> > * other part of the kernel decides
> > it
> > * should be recorded. */
> > - AUDIT_RECORD_CONTEXT /* Create the per-task
> > audit_context,
> > + AUDITSC_RECORD_CONTEXT /* Create the per-task
> > audit_context,
> > * always fill it in at syscall
> > entry
> > * time, and always write out the
> > audit
> > * record at syscall exit time. */
>
> I believe that just as the AUDIT_ prefix proved to be a bit too
> generic, I think that the AUDITSC_ prefix is also not the best
> choice.
> Would you object to using the AUDIT_STATE_ prefix? As that may get a
> bit long, I might suggest dropping the _CONTEXT from the enums too
> such that you would end up with the following:
>
> enum audit_state {
> AUDIT_STATE_DISABLED,
> AUDIT_STATE_BUILD,
> AUDIT_STATE_RECORD,
> };
>
> Thoughts?
>
next prev parent reply other threads:[~2021-06-07 9:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 11:21 [PATCH] audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition Sergey Nazarov
2021-06-04 16:17 ` Richard Guy Briggs
2021-06-06 2:40 ` Paul Moore
2021-06-07 9:58 ` Sergey Nazarov [this message]
2021-06-07 17:07 ` Paul Moore
2021-06-07 17:50 ` Richard Guy Briggs
2021-06-07 18:18 ` Paul Moore
2021-06-08 6:32 ` [PATCH v2] " Sergey Nazarov
2021-06-08 15:04 ` Richard Guy Briggs
2021-06-09 2:12 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=79d5bffd63b46bb7d54ebcef4765cfca28f76ff0.camel@yandex.ru \
--to=s-nazarov@yandex.ru \
--cc=eparis@redhat.com \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paul@paul-moore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).