git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
kernel
/
audit.c
diff --git
a/kernel/audit.c
b/kernel/audit.c
index
963fd15
..
d9b690a
100644
(file)
--- a/
kernel/audit.c
+++ b/
kernel/audit.c
@@
-57,6
+57,7
@@
#include <linux/netlink.h>
#include <linux/selinux.h>
#include <linux/inotify.h>
#include <linux/netlink.h>
#include <linux/selinux.h>
#include <linux/inotify.h>
+#include <linux/freezer.h>
#include "audit.h"
#include "audit.h"
@@
-244,7
+245,7
@@
static int audit_set_rate_limit(int limit, uid_t loginuid, u32 sid)
char *ctx = NULL;
u32 len;
int rc;
char *ctx = NULL;
u32 len;
int rc;
- if ((rc = selinux_
ctx
id_to_string(sid, &ctx, &len)))
+ if ((rc = selinux_
s
id_to_string(sid, &ctx, &len)))
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@
-267,7
+268,7
@@
static int audit_set_backlog_limit(int limit, uid_t loginuid, u32 sid)
char *ctx = NULL;
u32 len;
int rc;
char *ctx = NULL;
u32 len;
int rc;
- if ((rc = selinux_
ctx
id_to_string(sid, &ctx, &len)))
+ if ((rc = selinux_
s
id_to_string(sid, &ctx, &len)))
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@
-293,7
+294,7
@@
static int audit_set_enabled(int state, uid_t loginuid, u32 sid)
char *ctx = NULL;
u32 len;
int rc;
char *ctx = NULL;
u32 len;
int rc;
- if ((rc = selinux_
ctx
id_to_string(sid, &ctx, &len)))
+ if ((rc = selinux_
s
id_to_string(sid, &ctx, &len)))
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@
-321,7
+322,7
@@
static int audit_set_failure(int state, uid_t loginuid, u32 sid)
char *ctx = NULL;
u32 len;
int rc;
char *ctx = NULL;
u32 len;
int rc;
- if ((rc = selinux_
ctx
id_to_string(sid, &ctx, &len)))
+ if ((rc = selinux_
s
id_to_string(sid, &ctx, &len)))
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
return rc;
else
audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
@@
-340,7
+341,7
@@
static int kauditd_thread(void *dummy)
{
struct sk_buff *skb;
{
struct sk_buff *skb;
- while (
1
) {
+ while (
!kthread_should_stop()
) {
skb = skb_dequeue(&audit_skb_queue);
wake_up(&audit_backlog_wait);
if (skb) {
skb = skb_dequeue(&audit_skb_queue);
wake_up(&audit_backlog_wait);
if (skb) {
@@
-369,6
+370,7
@@
static int kauditd_thread(void *dummy)
remove_wait_queue(&kauditd_wait, &wait);
}
}
remove_wait_queue(&kauditd_wait, &wait);
}
}
+ return 0;
}
int audit_send_list(void *_dest)
}
int audit_send_list(void *_dest)
@@
-538,7
+540,7
@@
static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
if (status_get->mask & AUDIT_STATUS_PID) {
int old = audit_pid;
if (sid) {
if (status_get->mask & AUDIT_STATUS_PID) {
int old = audit_pid;
if (sid) {
- if ((err = selinux_
ctx
id_to_string(
+ if ((err = selinux_
s
id_to_string(
sid, &ctx, &len)))
return err;
else
sid, &ctx, &len)))
return err;
else
@@
-576,7
+578,7
@@
static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
"user pid=%d uid=%u auid=%u",
pid, uid, loginuid);
if (sid) {
"user pid=%d uid=%u auid=%u",
pid, uid, loginuid);
if (sid) {
- if (selinux_
ctx
id_to_string(
+ if (selinux_
s
id_to_string(
sid, &ctx, &len)) {
audit_log_format(ab,
" ssid=%u", sid);
sid, &ctx, &len)) {
audit_log_format(ab,
" ssid=%u", sid);
@@
-614,7
+616,7
@@
static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
loginuid, sid);
break;
case AUDIT_SIGNAL_INFO:
loginuid, sid);
break;
case AUDIT_SIGNAL_INFO:
- err = selinux_
ctx
id_to_string(audit_sig_sid, &ctx, &len);
+ err = selinux_
s
id_to_string(audit_sig_sid, &ctx, &len);
if (err)
return err;
sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
if (err)
return err;
sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);