From: Alex Dewar <alex.dewar90@gmail.com>
To: Alex Dewar <alex.dewar90@gmail.com>
Cc: Paul Moore <paul@paul-moore.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH RFC] netlabel: remove unused param from audit_log_format()
Date: Thu, 27 Aug 2020 18:20:06 +0100 [thread overview]
Message-ID: <20200827172006.gudui4alfbbf2a2p@medion> (raw)
In-Reply-To: <20200827170634.wogybzcxux7sgefb@medion>
On Thu, Aug 27, 2020 at 06:06:34PM +0100, Alex Dewar wrote:
> On Thu, Aug 27, 2020 at 01:00:58PM -0400, Paul Moore wrote:
> > On Thu, Aug 27, 2020 at 12:39 PM Alex Dewar <alex.dewar90@gmail.com> wrote:
> > >
> > > Commit d3b990b7f327 ("netlabel: fix problems with mapping removal")
> > > added a check to return an error if ret_val != 0, before ret_val is
> > > later used in a log message. Now it will unconditionally print "...
> > > res=0". So don't print res anymore.
> > >
> > > Addresses-Coverity: ("Dead code")
> > > Fixes: d3b990b7f327 ("netlabel: fix problems with mapping removal")
> > > Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
> > > ---
> > >
> > > I wasn't sure whether it was intended that something other than ret_val
> > > be printed in the log, so that's why I'm sending this as an RFC.
> >
> > It's intentional for a couple of reasons:
> >
> > * The people who care about audit logs like to see success/fail (e.g.
> > "res=X") for audit events/records, so printing this out gives them the
> > warm fuzzies.
> >
> > * For a lot of awful reasons that I won't bore you with, we really
> > don't want to add/remove fields in the middle of an audit record so we
> > pretty much need to keep the "res=0" there even if it seems a bit
> > redundant.
> >
> > So NACK from me, but thanks for paying attention just the same :)
>
> Would you rather just have an explicit "res=0" in there, without looking
> at ret_val? The thing is that ret_val will *always* be zero at this point in
> the code, because, if not, the function will already have returned.
> That's why Coverity flagged it up as a redundant check.
Sorry, I meant "res=1". The code will always print res=1, because
ret_val is always 0.
>
> >
> > > net/netlabel/netlabel_domainhash.c | 5 ++---
> > > 1 file changed, 2 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
> > > index f73a8382c275..526762b2f3a9 100644
> > > --- a/net/netlabel/netlabel_domainhash.c
> > > +++ b/net/netlabel/netlabel_domainhash.c
> > > @@ -612,9 +612,8 @@ int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
> > > audit_buf = netlbl_audit_start_common(AUDIT_MAC_MAP_DEL, audit_info);
> > > if (audit_buf != NULL) {
> > > audit_log_format(audit_buf,
> > > - " nlbl_domain=%s res=%u",
> > > - entry->domain ? entry->domain : "(default)",
> > > - ret_val == 0 ? 1 : 0);
> > > + " nlbl_domain=%s",
> > > + entry->domain ? entry->domain : "(default)");
> > > audit_log_end(audit_buf);
> > > }
> > >
> >
> > --
> > paul moore
> > www.paul-moore.com
next prev parent reply other threads:[~2020-08-27 17:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 16:37 [PATCH RFC] netlabel: remove unused param from audit_log_format() Alex Dewar
2020-08-27 17:00 ` Paul Moore
2020-08-27 17:06 ` Alex Dewar
2020-08-27 17:20 ` Alex Dewar [this message]
2020-08-27 20:10 ` Paul Moore
2020-08-28 13:55 ` [PATCH v2] " Alex Dewar
2020-08-28 14:35 ` Paul Moore
2020-08-28 16:09 ` David Miller
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=20200827172006.gudui4alfbbf2a2p@medion \
--to=alex.dewar90@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@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).