From: Richard Guy Briggs <rgb@redhat.com>
To: Paul Moore <paul@paul-moore.com>
Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] audit: skip sessionid sentinel value when auto-incrementing
Date: Tue, 15 Nov 2016 03:49:15 -0500 [thread overview]
Message-ID: <20161115084915.GI27818@madcap2.tricolour.ca> (raw)
In-Reply-To: <CAHC9VhS0z8qDRBebkaQAu8p-SdXGak_x1T8XmtS=Ydr=nA5XkQ@mail.gmail.com>
On 2016-11-14 15:17, Paul Moore wrote:
> On Thu, Nov 10, 2016 at 1:41 AM, Richard Guy Briggs <rgb@redhat.com> wrote:
> > The value (unsigned int)-1 is used as a sentinel to indicate the
> > sessionID is unset. Skip this value when the session_id value wraps.
> >
> > Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> > ---
> > kernel/auditsc.c | 5 ++++-
> > 1 files changed, 4 insertions(+), 1 deletions(-)
>
> Since we haven't merged the session ID kernel patches into audit#next
> yet, why don't you just squash this patch in with the session ID patch
> and resubmit upstream in one nice neat patch.
This was an existing bug regardless of new functionality added, so the
fix should not be buried in a new feature patch.
> > diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> > index 5abf1dc..e414dfa 100644
> > --- a/kernel/auditsc.c
> > +++ b/kernel/auditsc.c
> > @@ -2025,8 +2025,11 @@ int audit_set_loginuid(kuid_t loginuid)
> > goto out;
> >
> > /* are we setting or clearing? */
> > - if (uid_valid(loginuid))
> > + if (uid_valid(loginuid)) {
> > sessionid = (unsigned int)atomic_inc_return(&session_id);
> > + if (unlikely(sessionid == (unsigned int)-1))
> > + sessionid = (unsigned int)atomic_inc_return(&session_id);
> > + }
> >
> > task->sessionid = sessionid;
> > task->loginuid = loginuid;
>
> paul moore
- RGB
--
Richard Guy Briggs <rgb@redhat.com>
Kernel Security Engineering, Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635
next prev parent reply other threads:[~2016-11-15 8:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 6:41 [PATCH] audit: skip sessionid sentinel value when auto-incrementing Richard Guy Briggs
2016-11-14 20:17 ` Paul Moore
2016-11-15 8:49 ` Richard Guy Briggs [this message]
2016-11-17 23:34 ` Paul Moore
2016-11-18 2:27 ` Richard Guy Briggs
2016-11-20 20:34 ` 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=20161115084915.GI27818@madcap2.tricolour.ca \
--to=rgb@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).