[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120926134755.37b3db32.akpm@linux-foundation.org>
Date: Wed, 26 Sep 2012 13:47:55 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Kees Cook <keescook@...omium.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Fengguang Wu <fengguang.wu@...el.com>
Subject: Re: linux-next: build failure after merge of the akpm tree
On Wed, 26 Sep 2012 13:42:05 -0700
Kees Cook <keescook@...omium.org> wrote:
> > +static inline int audit_get_loginuid(struct task_struct *tsk)
>
> Shouldn't this return kuid_t, due to "userns: Convert the audit
> loginuid to be a kuid"?
yup, thanks.
--- a/include/linux/audit.h~audith-replace-defines-with-c-stubs-fix
+++ a/include/linux/audit.h
@@ -530,7 +530,7 @@ extern int auditsc_get_stamp(struct audi
struct timespec *t, unsigned int *serial);
extern int audit_set_loginuid(kuid_t loginuid);
-static inline int audit_get_loginuid(struct task_struct *tsk)
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
{
return tsk->loginuid
}
@@ -677,7 +677,7 @@ static inline int auditsc_get_stamp(stru
{
return 0;
}
-static inline int audit_get_loginuid(struct task_struct *tsk)
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
{
return INVALID_UID;
}
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists