date:20131101

[PATCH 1/5] audit: fix incorrect order of log new and old feature

2013-11-01 Thread Gao feng

The order of new feature and old feature is incorrect,
this patch fix it.

Acked-by: Eric Paris 
Signed-off-by: Gao feng 
---
 kernel/audit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 7c7c028..f16f835 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -664,7 +664,7 @@ static void audit_log_feature_change(int which, u32 
old_feature, u32 new_feature
struct audit_buffer *ab;
 
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE);
-   audit_log_format(ab, "feature=%s new=%d old=%d old_lock=%d new_lock=%d 
res=%d",
+   audit_log_format(ab, "feature=%s old=%d new=%d old_lock=%d new_lock=%d 
res=%d",
 audit_feature_names[which], !!old_feature, 
!!new_feature,
 !!old_lock, !!new_lock, res);
audit_log_end(ab);
-- 
1.8.3.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

[PATCH 2/5] audit: don't generate audit feature changed log when audit disabled

2013-11-01 Thread Gao feng

If audit is disabled,we shouldn't generate the audit log.

Acked-by: Eric Paris 
Signed-off-by: Gao feng 
---
 kernel/audit.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/audit.c b/kernel/audit.c
index f16f835..c307786 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -663,6 +663,9 @@ static void audit_log_feature_change(int which, u32 
old_feature, u32 new_feature
 {
struct audit_buffer *ab;
 
+   if (audit_enabled == AUDIT_OFF)
+   return;
+
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE);
audit_log_format(ab, "feature=%s old=%d new=%d old_lock=%d new_lock=%d 
res=%d",
 audit_feature_names[which], !!old_feature, 
!!new_feature,
-- 
1.8.3.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

[PATCH 3/5] audit: use old_lock in audit_set_feature

2013-11-01 Thread Gao feng

we already have old_lock, no need to calculate it again.

Acked-by: Eric Paris 
Signed-off-by: Gao feng 
---
 kernel/audit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index c307786..19f21ae 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -697,7 +697,7 @@ static int audit_set_feature(struct sk_buff *skb)
old_lock = af.lock & feature;
 
/* are we changing a locked feature? */
-   if ((af.lock & feature) && (new_feature != old_feature)) {
+   if (old_lock && (new_feature != old_feature)) {
audit_log_feature_change(i, old_feature, new_feature,
 old_lock, new_lock, 0);
return -EPERM;
-- 
1.8.3.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

[PATCH 4/5] audit: don't generate loginuid log when audit disabled

2013-11-01 Thread Gao feng

If audit is disabled, we shouldn't generate loginuid audit
log.

Acked-by: Eric Paris 
Signed-off-by: Gao feng 
---
 kernel/auditsc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 065c7a1..ceb396f 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1990,6 +1990,9 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, 
kuid_t kloginuid,
struct audit_buffer *ab;
uid_t uid, ologinuid, nloginuid;
 
+   if (!audit_enabled)
+   return;
+
uid = from_kuid(&init_user_ns, task_uid(current));
ologinuid = from_kuid(&init_user_ns, koldloginuid);
nloginuid = from_kuid(&init_user_ns, kloginuid),
-- 
1.8.3.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

[PATCH 5/5] audit: change the type of oldloginuid from kuid_t to unsigned long

2013-11-01 Thread Gao feng

The type of oldloginuid should be unsigned long.

Signed-off-by: Gao feng 
---
 kernel/auditsc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index ceb396f..9f871ad 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2018,7 +2018,8 @@ int audit_set_loginuid(kuid_t loginuid)
 {
struct task_struct *task = current;
unsigned int sessionid = -1;
-   kuid_t oldloginuid, oldsessionid;
+   kuid_t oldloginuid;
+   unsigned long oldsessionid;
int rc;
 
oldloginuid = audit_get_loginuid(current);
-- 
1.8.3.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread Richard Guy Briggs

On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > +   if (msg_type != AUDIT_USER_TTY) {
> > +   char fmt[64];
> > +   strcat(fmt, " msg='%.");
> > +   strcat(fmt, "AUDIT_MESSAGE_TEXT_MAX");
> > +   strcat(fmt, "s'");
> > +   audit_log_format(ab, fmt, (char *)data);
> > +   } else {
> 
> I am ok with this. In fact I was going to do this the first time, but I
> thought their would be some explicit reason to avoid the additional
> run time overhead as the concat could be made at compile time.

Ok, this was in danger of starting with fmt in an unknown state.  Latest
patch: 

diff --git a/kernel/audit.c b/kernel/audit.c
@@ -148,6 +148,8 @@ DEFINE_MUTEX(audit_cmd_mutex);
  * should be at least that large. */
 #define AUDIT_BUFSIZ 1024
 
+char usermsg_format[64] = "";
+
 /* AUDIT_MAXFREE is the number of empty audit_buffers we keep on the
  * audit_freelist.  Doing so eliminates many kmalloc/kfree calls. */
 #define AUDIT_MAXFREE  (2*NR_CPUS)
@@ -714,11 +716,15 @@ static int audit_receive_msg(struct sk_buff *skb, struct 
nlmsghdr *nlh)
break;
}
audit_log_common_recv_msg(&ab, msg_type);
-   if (msg_type != AUDIT_USER_TTY)
-   audit_log_format(ab,
-" 
msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
+   if (msg_type != AUDIT_USER_TTY) {
+   if (unlikely(usermsg_format[0] == 0))
+   snprintf(usermsg_format,
+   sizeof(usermsg_format),
+   " msg=\'%%.%ds\'", 
+   AUDIT_MESSAGE_TEXT_MAX);
+   audit_log_format(ab, usermsg_format,
 (char *)data);
-   else {
+   } else {
int size;
 
audit_log_format(ab, " data=");

- RGB

--
Richard Guy Briggs 
Senior Software Engineer
Kernel Security
AMER ENG Base Operating Systems
Remote, Ottawa, Canada
Voice: +1.647.777.2635
Internal: (81) 32635
Alt: +1.613.693.0684x3545

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread Steve Grubb

On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > +   if (msg_type != AUDIT_USER_TTY) {
> > > +   char fmt[64];
> > > +   strcat(fmt, " msg='%.");
> > > +   strcat(fmt, "AUDIT_MESSAGE_TEXT_MAX");
> > > +   strcat(fmt, "s'");
> > > +   audit_log_format(ab, fmt, (char *)data);
> > > +   } else {
> > 
> > I am ok with this. In fact I was going to do this the first time, but I
> > thought their would be some explicit reason to avoid the additional
> > run time overhead as the concat could be made at compile time.
> 
> Ok, this was in danger of starting with fmt in an unknown state.  Latest
> patch:
> 
> diff --git a/kernel/audit.c b/kernel/audit.c
> @@ -148,6 +148,8 @@ DEFINE_MUTEX(audit_cmd_mutex);
>   * should be at least that large. */
>  #define AUDIT_BUFSIZ 1024
> 
> +char usermsg_format[64] = "";

You might want this ^^^  to be static so its not global in scope.

-Steve


>  /* AUDIT_MAXFREE is the number of empty audit_buffers we keep on the
>   * audit_freelist.  Doing so eliminates many kmalloc/kfree calls. */
>  #define AUDIT_MAXFREE  (2*NR_CPUS)
> @@ -714,11 +716,15 @@ static int audit_receive_msg(struct sk_buff *skb,
> struct nlmsghdr *nlh) break;
>   }
>   audit_log_common_recv_msg(&ab, msg_type);
> - if (msg_type != AUDIT_USER_TTY)
> - audit_log_format(ab,
> -  " 
> msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
> + if (msg_type != AUDIT_USER_TTY) {
> + if (unlikely(usermsg_format[0] == 0))
> + snprintf(usermsg_format,
> + sizeof(usermsg_format),
> + " msg=\'%%.%ds\'",
> + AUDIT_MESSAGE_TEXT_MAX);
> + audit_log_format(ab, usermsg_format,
>(char *)data);
> - else {
> + } else {
>   int size;
> 
>   audit_log_format(ab, " data=");
> 
> - RGB
> 
> --
> Richard Guy Briggs 
> Senior Software Engineer
> Kernel Security
> AMER ENG Base Operating Systems
> Remote, Ottawa, Canada
> Voice: +1.647.777.2635
> Internal: (81) 32635
> Alt: +1.613.693.0684x3545
> 
> --
> Linux-audit mailing list
> Linux-audit@redhat.com
> https://www.redhat.com/mailman/listinfo/linux-audit

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread Richard Guy Briggs

On Fri, Nov 01, 2013 at 12:34:55PM -0400, Steve Grubb wrote:
> On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> > On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > > +   if (msg_type != AUDIT_USER_TTY) {
> > > > +   char fmt[64];
> > > > +   strcat(fmt, " msg='%.");
> > > > +   strcat(fmt, "AUDIT_MESSAGE_TEXT_MAX");
> > > > +   strcat(fmt, "s'");
> > > > +   audit_log_format(ab, fmt, (char *)data);
> > > > +   } else {
> > > 
> > > I am ok with this. In fact I was going to do this the first time, but I
> > > thought their would be some explicit reason to avoid the additional
> > > run time overhead as the concat could be made at compile time.
> > 
> > Ok, this was in danger of starting with fmt in an unknown state.  Latest
> > patch:
> > 
> > diff --git a/kernel/audit.c b/kernel/audit.c
> > @@ -148,6 +148,8 @@ DEFINE_MUTEX(audit_cmd_mutex);
> >   * should be at least that large. */
> >  #define AUDIT_BUFSIZ 1024
> > 
> > +char usermsg_format[64] = "";
> 
> You might want this ^^^  to be static so its not global in scope.

Yup, good point.  Thanks.

> -Steve
> 
> >  /* AUDIT_MAXFREE is the number of empty audit_buffers we keep on the
> >   * audit_freelist.  Doing so eliminates many kmalloc/kfree calls. */
> >  #define AUDIT_MAXFREE  (2*NR_CPUS)
> > @@ -714,11 +716,15 @@ static int audit_receive_msg(struct sk_buff *skb,
> > struct nlmsghdr *nlh) break;
> > }
> > audit_log_common_recv_msg(&ab, msg_type);
> > -   if (msg_type != AUDIT_USER_TTY)
> > -   audit_log_format(ab,
> > -" 
> > msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
> > +   if (msg_type != AUDIT_USER_TTY) {
> > +   if (unlikely(usermsg_format[0] == 0))
> > +   snprintf(usermsg_format,
> > +   sizeof(usermsg_format),
> > +   " msg=\'%%.%ds\'",
> > +   AUDIT_MESSAGE_TEXT_MAX);
> > +   audit_log_format(ab, usermsg_format,
> >  (char *)data);
> > -   else {
> > +   } else {
> > int size;
> > 
> > audit_log_format(ab, " data=");
> > 
> > - RGB
> > 
> > --
> > Richard Guy Briggs 
> > Senior Software Engineer
> > Kernel Security
> > AMER ENG Base Operating Systems
> > Remote, Ottawa, Canada
> > Voice: +1.647.777.2635
> > Internal: (81) 32635
> > Alt: +1.613.693.0684x3545
> > 
> > --
> > Linux-audit mailing list
> > Linux-audit@redhat.com
> > https://www.redhat.com/mailman/listinfo/linux-audit
> 

- RGB

--
Richard Guy Briggs 
Senior Software Engineer
Kernel Security
AMER ENG Base Operating Systems
Remote, Ottawa, Canada
Voice: +1.647.777.2635
Internal: (81) 32635
Alt: +1.613.693.0684x3545

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread Richard Guy Briggs

On Fri, Nov 01, 2013 at 12:38:15PM -0400, Richard Guy Briggs wrote:
> On Fri, Nov 01, 2013 at 12:34:55PM -0400, Steve Grubb wrote:
> > On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> > > On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > +char usermsg_format[64] = "";
> > 
> > You might want this ^^^  to be static so its not global in scope.
> 
> Yup, good point.  Thanks.

Better yet, make it local to that if statement, but Eric Paris has a far
more readable and elegant solution:

diff --git a/kernel/audit.c b/kernel/audit.c
@@ -864,8 +864,8 @@ static int audit_receive_msg(struct sk_buff *skb,
struct nlmsghdr *nlh)
}
audit_log_common_recv_msg(&ab, msg_type);
if (msg_type != AUDIT_USER_TTY)
-   audit_log_format(ab,
-" 
msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
+   audit_log_format(ab, " msg='%.*s'",
+AUDIT_MESSAGE_TEXT_MAX,
 (char *)data);
else {
int size;

I forgot about the * format specifier...

> > -Steve
> > 
> > > - RGB
> 
> - RGB

- RGB

--
Richard Guy Briggs 
Senior Software Engineer
Kernel Security
AMER ENG Base Operating Systems
Remote, Ottawa, Canada
Voice: +1.647.777.2635
Internal: (81) 32635
Alt: +1.613.693.0684x3545

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread William Roberts

On Nov 1, 2013 12:58 PM, "Richard Guy Briggs"  wrote:
>
> On Fri, Nov 01, 2013 at 12:38:15PM -0400, Richard Guy Briggs wrote:
> > On Fri, Nov 01, 2013 at 12:34:55PM -0400, Steve Grubb wrote:
> > > On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> > > > On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > > +char usermsg_format[64] = "";
> > >
> > > You might want this ^^^  to be static so its not global in scope.
> >
> > Yup, good point.  Thanks.
>
> Better yet, make it local to that if statement, but Eric Paris has a far
> more readable and elegant solution:
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> @@ -864,8 +864,8 @@ static int audit_receive_msg(struct sk_buff *skb,
> struct nlmsghdr *nlh)
> }
> audit_log_common_recv_msg(&ab, msg_type);
> if (msg_type != AUDIT_USER_TTY)
> -   audit_log_format(ab,
> -"
msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
> +   audit_log_format(ab, " msg='%.*s'",
> +AUDIT_MESSAGE_TEXT_MAX,
>  (char *)data);
> else {
> int size;
>
> I forgot about the * format specifier...
Yeah me too... I think everyone does :-)
>
> > > -Steve
> > >
> > > > - RGB
> >
> > - RGB
>
> - RGB
>
> --
> Richard Guy Briggs 
> Senior Software Engineer
> Kernel Security
> AMER ENG Base Operating Systems
> Remote, Ottawa, Canada
> Voice: +1.647.777.2635
> Internal: (81) 32635
> Alt: +1.613.693.0684x3545
>
> --
> Linux-audit mailing list
> Linux-audit@redhat.com
> https://www.redhat.com/mailman/listinfo/linux-audit
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread David Rebman

unsubscribe

From: William Roberts 
mailto:bill.c.robe...@gmail.com>>
Date: Friday, November 1, 2013 at 5:10 PM
To: Richard Guy Briggs mailto:r...@redhat.com>>
Cc: "linux-audit@redhat.com" 
mailto:linux-audit@redhat.com>>
Subject: Re: Format specifier issue when building kernel


On Nov 1, 2013 12:58 PM, "Richard Guy Briggs" 
mailto:r...@redhat.com>> wrote:
>
> On Fri, Nov 01, 2013 at 12:38:15PM -0400, Richard Guy Briggs wrote:
> > On Fri, Nov 01, 2013 at 12:34:55PM -0400, Steve Grubb wrote:
> > > On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> > > > On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > > +char usermsg_format[64] = "";
> > >
> > > You might want this ^^^  to be static so its not global in scope.
> >
> > Yup, good point.  Thanks.
>
> Better yet, make it local to that if statement, but Eric Paris has a far
> more readable and elegant solution:
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> @@ -864,8 +864,8 @@ static int audit_receive_msg(struct sk_buff *skb,
> struct nlmsghdr *nlh)
> }
> audit_log_common_recv_msg(&ab, msg_type);
> if (msg_type != AUDIT_USER_TTY)
> -   audit_log_format(ab,
> -" 
> msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
> +   audit_log_format(ab, " msg='%.*s'",
> +AUDIT_MESSAGE_TEXT_MAX,
>  (char *)data);
> else {
> int size;
>
> I forgot about the * format specifier...
Yeah me too... I think everyone does :-)
>
> > > -Steve
> > >
> > > > - RGB
> >
> > - RGB
>
> - RGB
>
> --
> Richard Guy Briggs mailto:rbri...@redhat.com>>
> Senior Software Engineer
> Kernel Security
> AMER ENG Base Operating Systems
> Remote, Ottawa, Canada
> Voice: +1.647.777.2635
> Internal: (81) 32635
> Alt: +1.613.693.0684x3545
>
> --
> Linux-audit mailing list
> Linux-audit@redhat.com
> https://www.redhat.com/mailman/listinfo/linux-audit
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: Format specifier issue when building kernel

2013-11-01 Thread William Roberts

FYI... Sending unsubscribe to this list doest work.
On Nov 1, 2013 3:20 PM, "David Rebman"  wrote:

>  unsubscribe
>
>   From: William Roberts 
> Date: Friday, November 1, 2013 at 5:10 PM
> To: Richard Guy Briggs 
> Cc: "linux-audit@redhat.com" 
> Subject: Re: Format specifier issue when building kernel
>
>
> On Nov 1, 2013 12:58 PM, "Richard Guy Briggs"  wrote:
> >
> > On Fri, Nov 01, 2013 at 12:38:15PM -0400, Richard Guy Briggs wrote:
> > > On Fri, Nov 01, 2013 at 12:34:55PM -0400, Steve Grubb wrote:
> > > > On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> > > > > On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > > > +char usermsg_format[64] = "";
> > > >
> > > > You might want this ^^^  to be static so its not global in scope.
> > >
> > > Yup, good point.  Thanks.
> >
> > Better yet, make it local to that if statement, but Eric Paris has a far
> > more readable and elegant solution:
> >
> > diff --git a/kernel/audit.c b/kernel/audit.c
> > @@ -864,8 +864,8 @@ static int audit_receive_msg(struct sk_buff *skb,
> > struct nlmsghdr *nlh)
> > }
> > audit_log_common_recv_msg(&ab, msg_type);
> > if (msg_type != AUDIT_USER_TTY)
> > -   audit_log_format(ab,
> > -"
> msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
> > +   audit_log_format(ab, " msg='%.*s'",
> > +AUDIT_MESSAGE_TEXT_MAX,
> >  (char *)data);
> > else {
> > int size;
> >
> > I forgot about the * format specifier...
> Yeah me too... I think everyone does :-)
> >
> > > > -Steve
> > > >
> > > > > - RGB
> > >
> > > - RGB
> >
> > - RGB
> >
> > --
> > Richard Guy Briggs 
> > Senior Software Engineer
> > Kernel Security
> > AMER ENG Base Operating Systems
> > Remote, Ottawa, Canada
> > Voice: +1.647.777.2635
> > Internal: (81) 32635
> > Alt: +1.613.693.0684x3545
> >
> > --
> > Linux-audit mailing list
> > Linux-audit@redhat.com
> > https://www.redhat.com/mailman/listinfo/linux-audit
>
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: [PATCH 5/5] audit: change the type of oldloginuid from kuid_t to unsigned long

2013-11-01 Thread Richard Guy Briggs

On Fri, Nov 01, 2013 at 07:34:46PM +0800, Gao feng wrote:
> The type of oldloginuid should be unsigned long.

Can you say why unsigned long rather than int returned from
audit_get_sessionid() or unsigned int expected by
audit_log_set_loginuid()?

Kees: For that matter, why does audit_get_sessionid() return int rather
than unsigned int from task_struct?  That was introduced in commit
9321d526.

> Signed-off-by: Gao feng 
> ---
>  kernel/auditsc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index ceb396f..9f871ad 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -2018,7 +2018,8 @@ int audit_set_loginuid(kuid_t loginuid)
>  {
>   struct task_struct *task = current;
>   unsigned int sessionid = -1;
> - kuid_t oldloginuid, oldsessionid;
> + kuid_t oldloginuid;
> + unsigned long oldsessionid;
>   int rc;
>  
>   oldloginuid = audit_get_loginuid(current);
> -- 
> 1.8.3.1

- RGB

--
Richard Guy Briggs 
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red 
Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

Re: [PATCH 5/5] audit: change the type of oldloginuid from kuid_t to unsigned long

2013-11-01 Thread Gao feng

On 11/02/2013 01:00 PM, Richard Guy Briggs wrote:
> On Fri, Nov 01, 2013 at 07:34:46PM +0800, Gao feng wrote:
>> The type of oldloginuid should be unsigned long.
> 
> Can you say why unsigned long rather than int returned from
> audit_get_sessionid() or unsigned int expected by
> audit_log_set_loginuid()?

Oh..it's my miss, it definitely should be unsigned int.
I will resend this one separately.

Thanks!
> 
> Kees: For that matter, why does audit_get_sessionid() return int rather
> than unsigned int from task_struct?  That was introduced in commit
> 9321d526.
> 
>> Signed-off-by: Gao feng 
>> ---
>>  kernel/auditsc.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
>> index ceb396f..9f871ad 100644
>> --- a/kernel/auditsc.c
>> +++ b/kernel/auditsc.c
>> @@ -2018,7 +2018,8 @@ int audit_set_loginuid(kuid_t loginuid)
>>  {
>>  struct task_struct *task = current;
>>  unsigned int sessionid = -1;
>> -kuid_t oldloginuid, oldsessionid;
>> +kuid_t oldloginuid;
>> +unsigned long oldsessionid;
>>  int rc;
>>  
>>  oldloginuid = audit_get_loginuid(current);
>> -- 
>> 1.8.3.1
> 
> - RGB
> 
> --
> Richard Guy Briggs 
> Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, 
> Red Hat
> Remote, Ottawa, Canada
> Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
> 

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

[PATCH 1/5] audit: fix incorrect order of log new and old feature

[PATCH 2/5] audit: don't generate audit feature changed log when audit disabled

[PATCH 3/5] audit: use old_lock in audit_set_feature

[PATCH 4/5] audit: don't generate loginuid log when audit disabled

[PATCH 5/5] audit: change the type of oldloginuid from kuid_t to unsigned long

Re: Format specifier issue when building kernel

Re: Format specifier issue when building kernel

Re: Format specifier issue when building kernel

Re: Format specifier issue when building kernel

Re: Format specifier issue when building kernel

Re: Format specifier issue when building kernel

Re: Format specifier issue when building kernel

Re: [PATCH 5/5] audit: change the type of oldloginuid from kuid_t to unsigned long

Re: [PATCH 5/5] audit: change the type of oldloginuid from kuid_t to unsigned long

14 matches

Site Navigation

Mail list logo

Footer information