projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[profile/ivi/kernel-x86-ivi.git]
/
kernel
/
audit.c
diff --git
a/kernel/audit.c
b/kernel/audit.c
index
e495624
..
9395003
100644
(file)
--- a/
kernel/audit.c
+++ b/
kernel/audit.c
@@
-74,6
+74,8
@@
static int audit_initialized;
int audit_enabled;
int audit_ever_enabled;
int audit_enabled;
int audit_ever_enabled;
+EXPORT_SYMBOL_GPL(audit_enabled);
+
/* Default state when kernel boots without any parameters. */
static int audit_default;
/* Default state when kernel boots without any parameters. */
static int audit_default;
@@
-671,9
+673,9
@@
static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
pid = NETLINK_CREDS(skb)->pid;
uid = NETLINK_CREDS(skb)->uid;
pid = NETLINK_CREDS(skb)->pid;
uid = NETLINK_CREDS(skb)->uid;
- loginuid =
NETLINK_CB(skb).loginuid
;
- sessionid =
NETLINK_CB(skb).sessionid
;
- s
id = NETLINK_CB(skb).sid
;
+ loginuid =
audit_get_loginuid(current)
;
+ sessionid =
audit_get_sessionid(current)
;
+ s
ecurity_task_getsecid(current, &sid)
;
seq = nlh->nlmsg_seq;
data = NLMSG_DATA(nlh);
seq = nlh->nlmsg_seq;
data = NLMSG_DATA(nlh);