Merge branch 'audit.b63' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b63' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: Fix rule eviction order for AUDIT_DIR Audit: clean up all op= output to include string quoting Audit: move audit_get_nd completely into audit_watch audit: seperate audit inode watches into a subfile Audit: clean up audit_receive_skb Audit: cleanup netlink mesg handling Audit: unify the printk of an skb when auditd not around Audit: dereferencing krule as if it were an audit_watch Audit: better estimation of execve record length Audit: fix audit watch use after free
This commit is contained in:
commit
650a10dc48
@ -599,6 +599,8 @@ extern void audit_log_untrustedstring(struct audit_buffer *ab,
|
|||||||
extern void audit_log_d_path(struct audit_buffer *ab,
|
extern void audit_log_d_path(struct audit_buffer *ab,
|
||||||
const char *prefix,
|
const char *prefix,
|
||||||
struct path *path);
|
struct path *path);
|
||||||
|
extern void audit_log_key(struct audit_buffer *ab,
|
||||||
|
char *key);
|
||||||
extern void audit_log_lost(const char *message);
|
extern void audit_log_lost(const char *message);
|
||||||
extern int audit_update_lsm_rules(void);
|
extern int audit_update_lsm_rules(void);
|
||||||
|
|
||||||
@ -621,6 +623,7 @@ extern int audit_enabled;
|
|||||||
#define audit_log_n_untrustedstring(a,n,s) do { ; } while (0)
|
#define audit_log_n_untrustedstring(a,n,s) do { ; } while (0)
|
||||||
#define audit_log_untrustedstring(a,s) do { ; } while (0)
|
#define audit_log_untrustedstring(a,s) do { ; } while (0)
|
||||||
#define audit_log_d_path(b, p, d) do { ; } while (0)
|
#define audit_log_d_path(b, p, d) do { ; } while (0)
|
||||||
|
#define audit_log_key(b, k) do { ; } while (0)
|
||||||
#define audit_enabled 0
|
#define audit_enabled 0
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -70,7 +70,7 @@ obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
|
|||||||
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
|
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
|
||||||
obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
|
obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
|
||||||
obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
|
obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
|
||||||
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
|
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o audit_watch.o
|
||||||
obj-$(CONFIG_GCOV_KERNEL) += gcov/
|
obj-$(CONFIG_GCOV_KERNEL) += gcov/
|
||||||
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
|
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
|
||||||
obj-$(CONFIG_KPROBES) += kprobes.o
|
obj-$(CONFIG_KPROBES) += kprobes.o
|
||||||
|
146
kernel/audit.c
146
kernel/audit.c
@ -115,9 +115,6 @@ static atomic_t audit_lost = ATOMIC_INIT(0);
|
|||||||
/* The netlink socket. */
|
/* The netlink socket. */
|
||||||
static struct sock *audit_sock;
|
static struct sock *audit_sock;
|
||||||
|
|
||||||
/* Inotify handle. */
|
|
||||||
struct inotify_handle *audit_ih;
|
|
||||||
|
|
||||||
/* Hash for inode-based rules */
|
/* Hash for inode-based rules */
|
||||||
struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS];
|
struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS];
|
||||||
|
|
||||||
@ -136,7 +133,7 @@ static DECLARE_WAIT_QUEUE_HEAD(kauditd_wait);
|
|||||||
static DECLARE_WAIT_QUEUE_HEAD(audit_backlog_wait);
|
static DECLARE_WAIT_QUEUE_HEAD(audit_backlog_wait);
|
||||||
|
|
||||||
/* Serialize requests from userspace. */
|
/* Serialize requests from userspace. */
|
||||||
static DEFINE_MUTEX(audit_cmd_mutex);
|
DEFINE_MUTEX(audit_cmd_mutex);
|
||||||
|
|
||||||
/* AUDIT_BUFSIZ is the size of the temporary buffer used for formatting
|
/* AUDIT_BUFSIZ is the size of the temporary buffer used for formatting
|
||||||
* audit records. Since printk uses a 1024 byte buffer, this buffer
|
* audit records. Since printk uses a 1024 byte buffer, this buffer
|
||||||
@ -375,6 +372,25 @@ static void audit_hold_skb(struct sk_buff *skb)
|
|||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For one reason or another this nlh isn't getting delivered to the userspace
|
||||||
|
* audit daemon, just send it to printk.
|
||||||
|
*/
|
||||||
|
static void audit_printk_skb(struct sk_buff *skb)
|
||||||
|
{
|
||||||
|
struct nlmsghdr *nlh = nlmsg_hdr(skb);
|
||||||
|
char *data = NLMSG_DATA(nlh);
|
||||||
|
|
||||||
|
if (nlh->nlmsg_type != AUDIT_EOE) {
|
||||||
|
if (printk_ratelimit())
|
||||||
|
printk(KERN_NOTICE "type=%d %s\n", nlh->nlmsg_type, data);
|
||||||
|
else
|
||||||
|
audit_log_lost("printk limit exceeded\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
audit_hold_skb(skb);
|
||||||
|
}
|
||||||
|
|
||||||
static void kauditd_send_skb(struct sk_buff *skb)
|
static void kauditd_send_skb(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
@ -427,14 +443,8 @@ static int kauditd_thread(void *dummy)
|
|||||||
if (skb) {
|
if (skb) {
|
||||||
if (audit_pid)
|
if (audit_pid)
|
||||||
kauditd_send_skb(skb);
|
kauditd_send_skb(skb);
|
||||||
else {
|
else
|
||||||
if (printk_ratelimit())
|
audit_printk_skb(skb);
|
||||||
printk(KERN_NOTICE "%s\n", skb->data + NLMSG_SPACE(0));
|
|
||||||
else
|
|
||||||
audit_log_lost("printk limit exceeded\n");
|
|
||||||
|
|
||||||
audit_hold_skb(skb);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
DECLARE_WAITQUEUE(wait, current);
|
DECLARE_WAITQUEUE(wait, current);
|
||||||
set_current_state(TASK_INTERRUPTIBLE);
|
set_current_state(TASK_INTERRUPTIBLE);
|
||||||
@ -495,42 +505,25 @@ int audit_send_list(void *_dest)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_AUDIT_TREE
|
|
||||||
static int prune_tree_thread(void *unused)
|
|
||||||
{
|
|
||||||
mutex_lock(&audit_cmd_mutex);
|
|
||||||
audit_prune_trees();
|
|
||||||
mutex_unlock(&audit_cmd_mutex);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void audit_schedule_prune(void)
|
|
||||||
{
|
|
||||||
kthread_run(prune_tree_thread, NULL, "audit_prune_tree");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct sk_buff *audit_make_reply(int pid, int seq, int type, int done,
|
struct sk_buff *audit_make_reply(int pid, int seq, int type, int done,
|
||||||
int multi, void *payload, int size)
|
int multi, void *payload, int size)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
struct nlmsghdr *nlh;
|
struct nlmsghdr *nlh;
|
||||||
int len = NLMSG_SPACE(size);
|
|
||||||
void *data;
|
void *data;
|
||||||
int flags = multi ? NLM_F_MULTI : 0;
|
int flags = multi ? NLM_F_MULTI : 0;
|
||||||
int t = done ? NLMSG_DONE : type;
|
int t = done ? NLMSG_DONE : type;
|
||||||
|
|
||||||
skb = alloc_skb(len, GFP_KERNEL);
|
skb = nlmsg_new(size, GFP_KERNEL);
|
||||||
if (!skb)
|
if (!skb)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
nlh = NLMSG_PUT(skb, pid, seq, t, size);
|
nlh = NLMSG_NEW(skb, pid, seq, t, size, flags);
|
||||||
nlh->nlmsg_flags = flags;
|
data = NLMSG_DATA(nlh);
|
||||||
data = NLMSG_DATA(nlh);
|
|
||||||
memcpy(data, payload, size);
|
memcpy(data, payload, size);
|
||||||
return skb;
|
return skb;
|
||||||
|
|
||||||
nlmsg_failure: /* Used by NLMSG_PUT */
|
nlmsg_failure: /* Used by NLMSG_NEW */
|
||||||
if (skb)
|
if (skb)
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -926,28 +919,29 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get message from skb (based on rtnetlink_rcv_skb). Each message is
|
* Get message from skb. Each message is processed by audit_receive_msg.
|
||||||
* processed by audit_receive_msg. Malformed skbs with wrong length are
|
* Malformed skbs with wrong length are discarded silently.
|
||||||
* discarded silently.
|
|
||||||
*/
|
*/
|
||||||
static void audit_receive_skb(struct sk_buff *skb)
|
static void audit_receive_skb(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
int err;
|
struct nlmsghdr *nlh;
|
||||||
struct nlmsghdr *nlh;
|
/*
|
||||||
u32 rlen;
|
* len MUST be signed for NLMSG_NEXT to be able to dec it below 0
|
||||||
|
* if the nlmsg_len was not aligned
|
||||||
|
*/
|
||||||
|
int len;
|
||||||
|
int err;
|
||||||
|
|
||||||
while (skb->len >= NLMSG_SPACE(0)) {
|
nlh = nlmsg_hdr(skb);
|
||||||
nlh = nlmsg_hdr(skb);
|
len = skb->len;
|
||||||
if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
|
|
||||||
return;
|
while (NLMSG_OK(nlh, len)) {
|
||||||
rlen = NLMSG_ALIGN(nlh->nlmsg_len);
|
err = audit_receive_msg(skb, nlh);
|
||||||
if (rlen > skb->len)
|
/* if err or if this message says it wants a response */
|
||||||
rlen = skb->len;
|
if (err || (nlh->nlmsg_flags & NLM_F_ACK))
|
||||||
if ((err = audit_receive_msg(skb, nlh))) {
|
|
||||||
netlink_ack(skb, nlh, err);
|
netlink_ack(skb, nlh, err);
|
||||||
} else if (nlh->nlmsg_flags & NLM_F_ACK)
|
|
||||||
netlink_ack(skb, nlh, 0);
|
nlh = NLMSG_NEXT(nlh, len);
|
||||||
skb_pull(skb, rlen);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -959,13 +953,6 @@ static void audit_receive(struct sk_buff *skb)
|
|||||||
mutex_unlock(&audit_cmd_mutex);
|
mutex_unlock(&audit_cmd_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_AUDITSYSCALL
|
|
||||||
static const struct inotify_operations audit_inotify_ops = {
|
|
||||||
.handle_event = audit_handle_ievent,
|
|
||||||
.destroy_watch = audit_free_parent,
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Initialize audit support at boot time. */
|
/* Initialize audit support at boot time. */
|
||||||
static int __init audit_init(void)
|
static int __init audit_init(void)
|
||||||
{
|
{
|
||||||
@ -991,12 +978,6 @@ static int __init audit_init(void)
|
|||||||
|
|
||||||
audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized");
|
audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized");
|
||||||
|
|
||||||
#ifdef CONFIG_AUDITSYSCALL
|
|
||||||
audit_ih = inotify_init(&audit_inotify_ops);
|
|
||||||
if (IS_ERR(audit_ih))
|
|
||||||
audit_panic("cannot initialize inotify handle");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
|
for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
|
||||||
INIT_LIST_HEAD(&audit_inode_hash[i]);
|
INIT_LIST_HEAD(&audit_inode_hash[i]);
|
||||||
|
|
||||||
@ -1070,18 +1051,20 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx,
|
|||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ab->skb = alloc_skb(AUDIT_BUFSIZ, gfp_mask);
|
|
||||||
if (!ab->skb)
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
ab->ctx = ctx;
|
ab->ctx = ctx;
|
||||||
ab->gfp_mask = gfp_mask;
|
ab->gfp_mask = gfp_mask;
|
||||||
nlh = (struct nlmsghdr *)skb_put(ab->skb, NLMSG_SPACE(0));
|
|
||||||
nlh->nlmsg_type = type;
|
ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask);
|
||||||
nlh->nlmsg_flags = 0;
|
if (!ab->skb)
|
||||||
nlh->nlmsg_pid = 0;
|
goto nlmsg_failure;
|
||||||
nlh->nlmsg_seq = 0;
|
|
||||||
|
nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0);
|
||||||
|
|
||||||
return ab;
|
return ab;
|
||||||
|
|
||||||
|
nlmsg_failure: /* Used by NLMSG_NEW */
|
||||||
|
kfree_skb(ab->skb);
|
||||||
|
ab->skb = NULL;
|
||||||
err:
|
err:
|
||||||
audit_buffer_free(ab);
|
audit_buffer_free(ab);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -1452,6 +1435,15 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
|
|||||||
kfree(pathname);
|
kfree(pathname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void audit_log_key(struct audit_buffer *ab, char *key)
|
||||||
|
{
|
||||||
|
audit_log_format(ab, " key=");
|
||||||
|
if (key)
|
||||||
|
audit_log_untrustedstring(ab, key);
|
||||||
|
else
|
||||||
|
audit_log_format(ab, "(null)");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* audit_log_end - end one audit record
|
* audit_log_end - end one audit record
|
||||||
* @ab: the audit_buffer
|
* @ab: the audit_buffer
|
||||||
@ -1475,15 +1467,7 @@ void audit_log_end(struct audit_buffer *ab)
|
|||||||
skb_queue_tail(&audit_skb_queue, ab->skb);
|
skb_queue_tail(&audit_skb_queue, ab->skb);
|
||||||
wake_up_interruptible(&kauditd_wait);
|
wake_up_interruptible(&kauditd_wait);
|
||||||
} else {
|
} else {
|
||||||
if (nlh->nlmsg_type != AUDIT_EOE) {
|
audit_printk_skb(ab->skb);
|
||||||
if (printk_ratelimit()) {
|
|
||||||
printk(KERN_NOTICE "type=%d %s\n",
|
|
||||||
nlh->nlmsg_type,
|
|
||||||
ab->skb->data + NLMSG_SPACE(0));
|
|
||||||
} else
|
|
||||||
audit_log_lost("printk limit exceeded\n");
|
|
||||||
}
|
|
||||||
audit_hold_skb(ab->skb);
|
|
||||||
}
|
}
|
||||||
ab->skb = NULL;
|
ab->skb = NULL;
|
||||||
}
|
}
|
||||||
|
@ -53,18 +53,7 @@ enum audit_state {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* Rule lists */
|
/* Rule lists */
|
||||||
struct audit_parent;
|
struct audit_watch;
|
||||||
|
|
||||||
struct audit_watch {
|
|
||||||
atomic_t count; /* reference count */
|
|
||||||
char *path; /* insertion path */
|
|
||||||
dev_t dev; /* associated superblock device */
|
|
||||||
unsigned long ino; /* associated inode number */
|
|
||||||
struct audit_parent *parent; /* associated parent */
|
|
||||||
struct list_head wlist; /* entry in parent->watches list */
|
|
||||||
struct list_head rules; /* associated rules */
|
|
||||||
};
|
|
||||||
|
|
||||||
struct audit_tree;
|
struct audit_tree;
|
||||||
struct audit_chunk;
|
struct audit_chunk;
|
||||||
|
|
||||||
@ -108,19 +97,28 @@ struct audit_netlink_list {
|
|||||||
|
|
||||||
int audit_send_list(void *);
|
int audit_send_list(void *);
|
||||||
|
|
||||||
struct inotify_watch;
|
|
||||||
/* Inotify handle */
|
|
||||||
extern struct inotify_handle *audit_ih;
|
|
||||||
|
|
||||||
extern void audit_free_parent(struct inotify_watch *);
|
|
||||||
extern void audit_handle_ievent(struct inotify_watch *, u32, u32, u32,
|
|
||||||
const char *, struct inode *);
|
|
||||||
extern int selinux_audit_rule_update(void);
|
extern int selinux_audit_rule_update(void);
|
||||||
|
|
||||||
extern struct mutex audit_filter_mutex;
|
extern struct mutex audit_filter_mutex;
|
||||||
extern void audit_free_rule_rcu(struct rcu_head *);
|
extern void audit_free_rule_rcu(struct rcu_head *);
|
||||||
extern struct list_head audit_filter_list[];
|
extern struct list_head audit_filter_list[];
|
||||||
|
|
||||||
|
/* audit watch functions */
|
||||||
|
extern unsigned long audit_watch_inode(struct audit_watch *watch);
|
||||||
|
extern dev_t audit_watch_dev(struct audit_watch *watch);
|
||||||
|
extern void audit_put_watch(struct audit_watch *watch);
|
||||||
|
extern void audit_get_watch(struct audit_watch *watch);
|
||||||
|
extern int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op);
|
||||||
|
extern int audit_add_watch(struct audit_krule *krule);
|
||||||
|
extern void audit_remove_watch(struct audit_watch *watch);
|
||||||
|
extern void audit_remove_watch_rule(struct audit_krule *krule, struct list_head *list);
|
||||||
|
extern void audit_inotify_unregister(struct list_head *in_list);
|
||||||
|
extern char *audit_watch_path(struct audit_watch *watch);
|
||||||
|
extern struct list_head *audit_watch_rules(struct audit_watch *watch);
|
||||||
|
|
||||||
|
extern struct audit_entry *audit_dupe_rule(struct audit_krule *old,
|
||||||
|
struct audit_watch *watch);
|
||||||
|
|
||||||
#ifdef CONFIG_AUDIT_TREE
|
#ifdef CONFIG_AUDIT_TREE
|
||||||
extern struct audit_chunk *audit_tree_lookup(const struct inode *);
|
extern struct audit_chunk *audit_tree_lookup(const struct inode *);
|
||||||
extern void audit_put_chunk(struct audit_chunk *);
|
extern void audit_put_chunk(struct audit_chunk *);
|
||||||
@ -130,10 +128,9 @@ extern int audit_add_tree_rule(struct audit_krule *);
|
|||||||
extern int audit_remove_tree_rule(struct audit_krule *);
|
extern int audit_remove_tree_rule(struct audit_krule *);
|
||||||
extern void audit_trim_trees(void);
|
extern void audit_trim_trees(void);
|
||||||
extern int audit_tag_tree(char *old, char *new);
|
extern int audit_tag_tree(char *old, char *new);
|
||||||
extern void audit_schedule_prune(void);
|
|
||||||
extern void audit_prune_trees(void);
|
|
||||||
extern const char *audit_tree_path(struct audit_tree *);
|
extern const char *audit_tree_path(struct audit_tree *);
|
||||||
extern void audit_put_tree(struct audit_tree *);
|
extern void audit_put_tree(struct audit_tree *);
|
||||||
|
extern void audit_kill_trees(struct list_head *);
|
||||||
#else
|
#else
|
||||||
#define audit_remove_tree_rule(rule) BUG()
|
#define audit_remove_tree_rule(rule) BUG()
|
||||||
#define audit_add_tree_rule(rule) -EINVAL
|
#define audit_add_tree_rule(rule) -EINVAL
|
||||||
@ -142,6 +139,7 @@ extern void audit_put_tree(struct audit_tree *);
|
|||||||
#define audit_put_tree(tree) (void)0
|
#define audit_put_tree(tree) (void)0
|
||||||
#define audit_tag_tree(old, new) -EINVAL
|
#define audit_tag_tree(old, new) -EINVAL
|
||||||
#define audit_tree_path(rule) "" /* never called */
|
#define audit_tree_path(rule) "" /* never called */
|
||||||
|
#define audit_kill_trees(list) BUG()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern char *audit_unpack_string(void **, size_t *, size_t);
|
extern char *audit_unpack_string(void **, size_t *, size_t);
|
||||||
@ -160,7 +158,10 @@ static inline int audit_signal_info(int sig, struct task_struct *t)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
extern void audit_filter_inodes(struct task_struct *, struct audit_context *);
|
extern void audit_filter_inodes(struct task_struct *, struct audit_context *);
|
||||||
|
extern struct list_head *audit_killed_trees(void);
|
||||||
#else
|
#else
|
||||||
#define audit_signal_info(s,t) AUDIT_DISABLED
|
#define audit_signal_info(s,t) AUDIT_DISABLED
|
||||||
#define audit_filter_inodes(t,c) AUDIT_DISABLED
|
#define audit_filter_inodes(t,c) AUDIT_DISABLED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
extern struct mutex audit_cmd_mutex;
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include <linux/inotify.h>
|
#include <linux/inotify.h>
|
||||||
#include <linux/namei.h>
|
#include <linux/namei.h>
|
||||||
#include <linux/mount.h>
|
#include <linux/mount.h>
|
||||||
|
#include <linux/kthread.h>
|
||||||
|
|
||||||
struct audit_tree;
|
struct audit_tree;
|
||||||
struct audit_chunk;
|
struct audit_chunk;
|
||||||
@ -441,13 +442,11 @@ static void kill_rules(struct audit_tree *tree)
|
|||||||
if (rule->tree) {
|
if (rule->tree) {
|
||||||
/* not a half-baked one */
|
/* not a half-baked one */
|
||||||
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE);
|
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE);
|
||||||
audit_log_format(ab, "op=remove rule dir=");
|
audit_log_format(ab, "op=");
|
||||||
|
audit_log_string(ab, "remove rule");
|
||||||
|
audit_log_format(ab, " dir=");
|
||||||
audit_log_untrustedstring(ab, rule->tree->pathname);
|
audit_log_untrustedstring(ab, rule->tree->pathname);
|
||||||
if (rule->filterkey) {
|
audit_log_key(ab, rule->filterkey);
|
||||||
audit_log_format(ab, " key=");
|
|
||||||
audit_log_untrustedstring(ab, rule->filterkey);
|
|
||||||
} else
|
|
||||||
audit_log_format(ab, " key=(null)");
|
|
||||||
audit_log_format(ab, " list=%d res=1", rule->listnr);
|
audit_log_format(ab, " list=%d res=1", rule->listnr);
|
||||||
audit_log_end(ab);
|
audit_log_end(ab);
|
||||||
rule->tree = NULL;
|
rule->tree = NULL;
|
||||||
@ -519,6 +518,8 @@ static void trim_marked(struct audit_tree *tree)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void audit_schedule_prune(void);
|
||||||
|
|
||||||
/* called with audit_filter_mutex */
|
/* called with audit_filter_mutex */
|
||||||
int audit_remove_tree_rule(struct audit_krule *rule)
|
int audit_remove_tree_rule(struct audit_krule *rule)
|
||||||
{
|
{
|
||||||
@ -824,10 +825,11 @@ int audit_tag_tree(char *old, char *new)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* That gets run when evict_chunk() ends up needing to kill audit_tree.
|
* That gets run when evict_chunk() ends up needing to kill audit_tree.
|
||||||
* Runs from a separate thread, with audit_cmd_mutex held.
|
* Runs from a separate thread.
|
||||||
*/
|
*/
|
||||||
void audit_prune_trees(void)
|
static int prune_tree_thread(void *unused)
|
||||||
{
|
{
|
||||||
|
mutex_lock(&audit_cmd_mutex);
|
||||||
mutex_lock(&audit_filter_mutex);
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
|
||||||
while (!list_empty(&prune_list)) {
|
while (!list_empty(&prune_list)) {
|
||||||
@ -844,6 +846,40 @@ void audit_prune_trees(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
mutex_unlock(&audit_filter_mutex);
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
mutex_unlock(&audit_cmd_mutex);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void audit_schedule_prune(void)
|
||||||
|
{
|
||||||
|
kthread_run(prune_tree_thread, NULL, "audit_prune_tree");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ... and that one is done if evict_chunk() decides to delay until the end
|
||||||
|
* of syscall. Runs synchronously.
|
||||||
|
*/
|
||||||
|
void audit_kill_trees(struct list_head *list)
|
||||||
|
{
|
||||||
|
mutex_lock(&audit_cmd_mutex);
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
|
||||||
|
while (!list_empty(list)) {
|
||||||
|
struct audit_tree *victim;
|
||||||
|
|
||||||
|
victim = list_entry(list->next, struct audit_tree, list);
|
||||||
|
kill_rules(victim);
|
||||||
|
list_del_init(&victim->list);
|
||||||
|
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
|
||||||
|
prune_one(victim);
|
||||||
|
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
mutex_unlock(&audit_cmd_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -854,6 +890,8 @@ void audit_prune_trees(void)
|
|||||||
static void evict_chunk(struct audit_chunk *chunk)
|
static void evict_chunk(struct audit_chunk *chunk)
|
||||||
{
|
{
|
||||||
struct audit_tree *owner;
|
struct audit_tree *owner;
|
||||||
|
struct list_head *postponed = audit_killed_trees();
|
||||||
|
int need_prune = 0;
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
if (chunk->dead)
|
if (chunk->dead)
|
||||||
@ -869,15 +907,21 @@ static void evict_chunk(struct audit_chunk *chunk)
|
|||||||
owner->root = NULL;
|
owner->root = NULL;
|
||||||
list_del_init(&owner->same_root);
|
list_del_init(&owner->same_root);
|
||||||
spin_unlock(&hash_lock);
|
spin_unlock(&hash_lock);
|
||||||
kill_rules(owner);
|
if (!postponed) {
|
||||||
list_move(&owner->list, &prune_list);
|
kill_rules(owner);
|
||||||
audit_schedule_prune();
|
list_move(&owner->list, &prune_list);
|
||||||
|
need_prune = 1;
|
||||||
|
} else {
|
||||||
|
list_move(&owner->list, postponed);
|
||||||
|
}
|
||||||
spin_lock(&hash_lock);
|
spin_lock(&hash_lock);
|
||||||
}
|
}
|
||||||
list_del_rcu(&chunk->hash);
|
list_del_rcu(&chunk->hash);
|
||||||
for (n = 0; n < chunk->count; n++)
|
for (n = 0; n < chunk->count; n++)
|
||||||
list_del_init(&chunk->owners[n].list);
|
list_del_init(&chunk->owners[n].list);
|
||||||
spin_unlock(&hash_lock);
|
spin_unlock(&hash_lock);
|
||||||
|
if (need_prune)
|
||||||
|
audit_schedule_prune();
|
||||||
mutex_unlock(&audit_filter_mutex);
|
mutex_unlock(&audit_filter_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
543
kernel/audit_watch.c
Normal file
543
kernel/audit_watch.c
Normal file
@ -0,0 +1,543 @@
|
|||||||
|
/* audit_watch.c -- watching inodes
|
||||||
|
*
|
||||||
|
* Copyright 2003-2009 Red Hat, Inc.
|
||||||
|
* Copyright 2005 Hewlett-Packard Development Company, L.P.
|
||||||
|
* Copyright 2005 IBM Corporation
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/audit.h>
|
||||||
|
#include <linux/kthread.h>
|
||||||
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/fs.h>
|
||||||
|
#include <linux/namei.h>
|
||||||
|
#include <linux/netlink.h>
|
||||||
|
#include <linux/sched.h>
|
||||||
|
#include <linux/inotify.h>
|
||||||
|
#include <linux/security.h>
|
||||||
|
#include "audit.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Reference counting:
|
||||||
|
*
|
||||||
|
* audit_parent: lifetime is from audit_init_parent() to receipt of an IN_IGNORED
|
||||||
|
* event. Each audit_watch holds a reference to its associated parent.
|
||||||
|
*
|
||||||
|
* audit_watch: if added to lists, lifetime is from audit_init_watch() to
|
||||||
|
* audit_remove_watch(). Additionally, an audit_watch may exist
|
||||||
|
* temporarily to assist in searching existing filter data. Each
|
||||||
|
* audit_krule holds a reference to its associated watch.
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct audit_watch {
|
||||||
|
atomic_t count; /* reference count */
|
||||||
|
char *path; /* insertion path */
|
||||||
|
dev_t dev; /* associated superblock device */
|
||||||
|
unsigned long ino; /* associated inode number */
|
||||||
|
struct audit_parent *parent; /* associated parent */
|
||||||
|
struct list_head wlist; /* entry in parent->watches list */
|
||||||
|
struct list_head rules; /* associated rules */
|
||||||
|
};
|
||||||
|
|
||||||
|
struct audit_parent {
|
||||||
|
struct list_head ilist; /* entry in inotify registration list */
|
||||||
|
struct list_head watches; /* associated watches */
|
||||||
|
struct inotify_watch wdata; /* inotify watch data */
|
||||||
|
unsigned flags; /* status flags */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Inotify handle. */
|
||||||
|
struct inotify_handle *audit_ih;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* audit_parent status flags:
|
||||||
|
*
|
||||||
|
* AUDIT_PARENT_INVALID - set anytime rules/watches are auto-removed due to
|
||||||
|
* a filesystem event to ensure we're adding audit watches to a valid parent.
|
||||||
|
* Technically not needed for IN_DELETE_SELF or IN_UNMOUNT events, as we cannot
|
||||||
|
* receive them while we have nameidata, but must be used for IN_MOVE_SELF which
|
||||||
|
* we can receive while holding nameidata.
|
||||||
|
*/
|
||||||
|
#define AUDIT_PARENT_INVALID 0x001
|
||||||
|
|
||||||
|
/* Inotify events we care about. */
|
||||||
|
#define AUDIT_IN_WATCH IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF
|
||||||
|
|
||||||
|
static void audit_free_parent(struct inotify_watch *i_watch)
|
||||||
|
{
|
||||||
|
struct audit_parent *parent;
|
||||||
|
|
||||||
|
parent = container_of(i_watch, struct audit_parent, wdata);
|
||||||
|
WARN_ON(!list_empty(&parent->watches));
|
||||||
|
kfree(parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
void audit_get_watch(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
atomic_inc(&watch->count);
|
||||||
|
}
|
||||||
|
|
||||||
|
void audit_put_watch(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
if (atomic_dec_and_test(&watch->count)) {
|
||||||
|
WARN_ON(watch->parent);
|
||||||
|
WARN_ON(!list_empty(&watch->rules));
|
||||||
|
kfree(watch->path);
|
||||||
|
kfree(watch);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void audit_remove_watch(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
list_del(&watch->wlist);
|
||||||
|
put_inotify_watch(&watch->parent->wdata);
|
||||||
|
watch->parent = NULL;
|
||||||
|
audit_put_watch(watch); /* match initial get */
|
||||||
|
}
|
||||||
|
|
||||||
|
char *audit_watch_path(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
return watch->path;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct list_head *audit_watch_rules(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
return &watch->rules;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long audit_watch_inode(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
return watch->ino;
|
||||||
|
}
|
||||||
|
|
||||||
|
dev_t audit_watch_dev(struct audit_watch *watch)
|
||||||
|
{
|
||||||
|
return watch->dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize a parent watch entry. */
|
||||||
|
static struct audit_parent *audit_init_parent(struct nameidata *ndp)
|
||||||
|
{
|
||||||
|
struct audit_parent *parent;
|
||||||
|
s32 wd;
|
||||||
|
|
||||||
|
parent = kzalloc(sizeof(*parent), GFP_KERNEL);
|
||||||
|
if (unlikely(!parent))
|
||||||
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
|
INIT_LIST_HEAD(&parent->watches);
|
||||||
|
parent->flags = 0;
|
||||||
|
|
||||||
|
inotify_init_watch(&parent->wdata);
|
||||||
|
/* grab a ref so inotify watch hangs around until we take audit_filter_mutex */
|
||||||
|
get_inotify_watch(&parent->wdata);
|
||||||
|
wd = inotify_add_watch(audit_ih, &parent->wdata,
|
||||||
|
ndp->path.dentry->d_inode, AUDIT_IN_WATCH);
|
||||||
|
if (wd < 0) {
|
||||||
|
audit_free_parent(&parent->wdata);
|
||||||
|
return ERR_PTR(wd);
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize a watch entry. */
|
||||||
|
static struct audit_watch *audit_init_watch(char *path)
|
||||||
|
{
|
||||||
|
struct audit_watch *watch;
|
||||||
|
|
||||||
|
watch = kzalloc(sizeof(*watch), GFP_KERNEL);
|
||||||
|
if (unlikely(!watch))
|
||||||
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
|
INIT_LIST_HEAD(&watch->rules);
|
||||||
|
atomic_set(&watch->count, 1);
|
||||||
|
watch->path = path;
|
||||||
|
watch->dev = (dev_t)-1;
|
||||||
|
watch->ino = (unsigned long)-1;
|
||||||
|
|
||||||
|
return watch;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Translate a watch string to kernel respresentation. */
|
||||||
|
int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op)
|
||||||
|
{
|
||||||
|
struct audit_watch *watch;
|
||||||
|
|
||||||
|
if (!audit_ih)
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
if (path[0] != '/' || path[len-1] == '/' ||
|
||||||
|
krule->listnr != AUDIT_FILTER_EXIT ||
|
||||||
|
op != Audit_equal ||
|
||||||
|
krule->inode_f || krule->watch || krule->tree)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
watch = audit_init_watch(path);
|
||||||
|
if (IS_ERR(watch))
|
||||||
|
return PTR_ERR(watch);
|
||||||
|
|
||||||
|
audit_get_watch(watch);
|
||||||
|
krule->watch = watch;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Duplicate the given audit watch. The new watch's rules list is initialized
|
||||||
|
* to an empty list and wlist is undefined. */
|
||||||
|
static struct audit_watch *audit_dupe_watch(struct audit_watch *old)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
struct audit_watch *new;
|
||||||
|
|
||||||
|
path = kstrdup(old->path, GFP_KERNEL);
|
||||||
|
if (unlikely(!path))
|
||||||
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
|
new = audit_init_watch(path);
|
||||||
|
if (IS_ERR(new)) {
|
||||||
|
kfree(path);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
new->dev = old->dev;
|
||||||
|
new->ino = old->ino;
|
||||||
|
get_inotify_watch(&old->parent->wdata);
|
||||||
|
new->parent = old->parent;
|
||||||
|
|
||||||
|
out:
|
||||||
|
return new;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watch *w, char *op)
|
||||||
|
{
|
||||||
|
if (audit_enabled) {
|
||||||
|
struct audit_buffer *ab;
|
||||||
|
ab = audit_log_start(NULL, GFP_NOFS, AUDIT_CONFIG_CHANGE);
|
||||||
|
audit_log_format(ab, "auid=%u ses=%u op=",
|
||||||
|
audit_get_loginuid(current),
|
||||||
|
audit_get_sessionid(current));
|
||||||
|
audit_log_string(ab, op);
|
||||||
|
audit_log_format(ab, " path=");
|
||||||
|
audit_log_untrustedstring(ab, w->path);
|
||||||
|
audit_log_key(ab, r->filterkey);
|
||||||
|
audit_log_format(ab, " list=%d res=1", r->listnr);
|
||||||
|
audit_log_end(ab);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Update inode info in audit rules based on filesystem event. */
|
||||||
|
static void audit_update_watch(struct audit_parent *parent,
|
||||||
|
const char *dname, dev_t dev,
|
||||||
|
unsigned long ino, unsigned invalidating)
|
||||||
|
{
|
||||||
|
struct audit_watch *owatch, *nwatch, *nextw;
|
||||||
|
struct audit_krule *r, *nextr;
|
||||||
|
struct audit_entry *oentry, *nentry;
|
||||||
|
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) {
|
||||||
|
if (audit_compare_dname_path(dname, owatch->path, NULL))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* If the update involves invalidating rules, do the inode-based
|
||||||
|
* filtering now, so we don't omit records. */
|
||||||
|
if (invalidating && current->audit_context)
|
||||||
|
audit_filter_inodes(current, current->audit_context);
|
||||||
|
|
||||||
|
nwatch = audit_dupe_watch(owatch);
|
||||||
|
if (IS_ERR(nwatch)) {
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
audit_panic("error updating watch, skipping");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
nwatch->dev = dev;
|
||||||
|
nwatch->ino = ino;
|
||||||
|
|
||||||
|
list_for_each_entry_safe(r, nextr, &owatch->rules, rlist) {
|
||||||
|
|
||||||
|
oentry = container_of(r, struct audit_entry, rule);
|
||||||
|
list_del(&oentry->rule.rlist);
|
||||||
|
list_del_rcu(&oentry->list);
|
||||||
|
|
||||||
|
nentry = audit_dupe_rule(&oentry->rule, nwatch);
|
||||||
|
if (IS_ERR(nentry)) {
|
||||||
|
list_del(&oentry->rule.list);
|
||||||
|
audit_panic("error updating watch, removing");
|
||||||
|
} else {
|
||||||
|
int h = audit_hash_ino((u32)ino);
|
||||||
|
list_add(&nentry->rule.rlist, &nwatch->rules);
|
||||||
|
list_add_rcu(&nentry->list, &audit_inode_hash[h]);
|
||||||
|
list_replace(&oentry->rule.list,
|
||||||
|
&nentry->rule.list);
|
||||||
|
}
|
||||||
|
|
||||||
|
audit_watch_log_rule_change(r, owatch, "updated rules");
|
||||||
|
|
||||||
|
call_rcu(&oentry->rcu, audit_free_rule_rcu);
|
||||||
|
}
|
||||||
|
|
||||||
|
audit_remove_watch(owatch);
|
||||||
|
goto add_watch_to_parent; /* event applies to a single watch */
|
||||||
|
}
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
return;
|
||||||
|
|
||||||
|
add_watch_to_parent:
|
||||||
|
list_add(&nwatch->wlist, &parent->watches);
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Remove all watches & rules associated with a parent that is going away. */
|
||||||
|
static void audit_remove_parent_watches(struct audit_parent *parent)
|
||||||
|
{
|
||||||
|
struct audit_watch *w, *nextw;
|
||||||
|
struct audit_krule *r, *nextr;
|
||||||
|
struct audit_entry *e;
|
||||||
|
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
parent->flags |= AUDIT_PARENT_INVALID;
|
||||||
|
list_for_each_entry_safe(w, nextw, &parent->watches, wlist) {
|
||||||
|
list_for_each_entry_safe(r, nextr, &w->rules, rlist) {
|
||||||
|
e = container_of(r, struct audit_entry, rule);
|
||||||
|
audit_watch_log_rule_change(r, w, "remove rule");
|
||||||
|
list_del(&r->rlist);
|
||||||
|
list_del(&r->list);
|
||||||
|
list_del_rcu(&e->list);
|
||||||
|
call_rcu(&e->rcu, audit_free_rule_rcu);
|
||||||
|
}
|
||||||
|
audit_remove_watch(w);
|
||||||
|
}
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Unregister inotify watches for parents on in_list.
|
||||||
|
* Generates an IN_IGNORED event. */
|
||||||
|
void audit_inotify_unregister(struct list_head *in_list)
|
||||||
|
{
|
||||||
|
struct audit_parent *p, *n;
|
||||||
|
|
||||||
|
list_for_each_entry_safe(p, n, in_list, ilist) {
|
||||||
|
list_del(&p->ilist);
|
||||||
|
inotify_rm_watch(audit_ih, &p->wdata);
|
||||||
|
/* the unpin matching the pin in audit_do_del_rule() */
|
||||||
|
unpin_inotify_watch(&p->wdata);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Get path information necessary for adding watches. */
|
||||||
|
static int audit_get_nd(char *path, struct nameidata **ndp, struct nameidata **ndw)
|
||||||
|
{
|
||||||
|
struct nameidata *ndparent, *ndwatch;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
ndparent = kmalloc(sizeof(*ndparent), GFP_KERNEL);
|
||||||
|
if (unlikely(!ndparent))
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
ndwatch = kmalloc(sizeof(*ndwatch), GFP_KERNEL);
|
||||||
|
if (unlikely(!ndwatch)) {
|
||||||
|
kfree(ndparent);
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = path_lookup(path, LOOKUP_PARENT, ndparent);
|
||||||
|
if (err) {
|
||||||
|
kfree(ndparent);
|
||||||
|
kfree(ndwatch);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = path_lookup(path, 0, ndwatch);
|
||||||
|
if (err) {
|
||||||
|
kfree(ndwatch);
|
||||||
|
ndwatch = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
*ndp = ndparent;
|
||||||
|
*ndw = ndwatch;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Release resources used for watch path information. */
|
||||||
|
static void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw)
|
||||||
|
{
|
||||||
|
if (ndp) {
|
||||||
|
path_put(&ndp->path);
|
||||||
|
kfree(ndp);
|
||||||
|
}
|
||||||
|
if (ndw) {
|
||||||
|
path_put(&ndw->path);
|
||||||
|
kfree(ndw);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Associate the given rule with an existing parent inotify_watch.
|
||||||
|
* Caller must hold audit_filter_mutex. */
|
||||||
|
static void audit_add_to_parent(struct audit_krule *krule,
|
||||||
|
struct audit_parent *parent)
|
||||||
|
{
|
||||||
|
struct audit_watch *w, *watch = krule->watch;
|
||||||
|
int watch_found = 0;
|
||||||
|
|
||||||
|
list_for_each_entry(w, &parent->watches, wlist) {
|
||||||
|
if (strcmp(watch->path, w->path))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
watch_found = 1;
|
||||||
|
|
||||||
|
/* put krule's and initial refs to temporary watch */
|
||||||
|
audit_put_watch(watch);
|
||||||
|
audit_put_watch(watch);
|
||||||
|
|
||||||
|
audit_get_watch(w);
|
||||||
|
krule->watch = watch = w;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!watch_found) {
|
||||||
|
get_inotify_watch(&parent->wdata);
|
||||||
|
watch->parent = parent;
|
||||||
|
|
||||||
|
list_add(&watch->wlist, &parent->watches);
|
||||||
|
}
|
||||||
|
list_add(&krule->rlist, &watch->rules);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Find a matching watch entry, or add this one.
|
||||||
|
* Caller must hold audit_filter_mutex. */
|
||||||
|
int audit_add_watch(struct audit_krule *krule)
|
||||||
|
{
|
||||||
|
struct audit_watch *watch = krule->watch;
|
||||||
|
struct inotify_watch *i_watch;
|
||||||
|
struct audit_parent *parent;
|
||||||
|
struct nameidata *ndp = NULL, *ndw = NULL;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
|
||||||
|
/* Avoid calling path_lookup under audit_filter_mutex. */
|
||||||
|
ret = audit_get_nd(watch->path, &ndp, &ndw);
|
||||||
|
if (ret) {
|
||||||
|
/* caller expects mutex locked */
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* update watch filter fields */
|
||||||
|
if (ndw) {
|
||||||
|
watch->dev = ndw->path.dentry->d_inode->i_sb->s_dev;
|
||||||
|
watch->ino = ndw->path.dentry->d_inode->i_ino;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The audit_filter_mutex must not be held during inotify calls because
|
||||||
|
* we hold it during inotify event callback processing. If an existing
|
||||||
|
* inotify watch is found, inotify_find_watch() grabs a reference before
|
||||||
|
* returning.
|
||||||
|
*/
|
||||||
|
if (inotify_find_watch(audit_ih, ndp->path.dentry->d_inode,
|
||||||
|
&i_watch) < 0) {
|
||||||
|
parent = audit_init_parent(ndp);
|
||||||
|
if (IS_ERR(parent)) {
|
||||||
|
/* caller expects mutex locked */
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
ret = PTR_ERR(parent);
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
parent = container_of(i_watch, struct audit_parent, wdata);
|
||||||
|
|
||||||
|
mutex_lock(&audit_filter_mutex);
|
||||||
|
|
||||||
|
/* parent was moved before we took audit_filter_mutex */
|
||||||
|
if (parent->flags & AUDIT_PARENT_INVALID)
|
||||||
|
ret = -ENOENT;
|
||||||
|
else
|
||||||
|
audit_add_to_parent(krule, parent);
|
||||||
|
|
||||||
|
/* match get in audit_init_parent or inotify_find_watch */
|
||||||
|
put_inotify_watch(&parent->wdata);
|
||||||
|
|
||||||
|
error:
|
||||||
|
audit_put_nd(ndp, ndw); /* NULL args OK */
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void audit_remove_watch_rule(struct audit_krule *krule, struct list_head *list)
|
||||||
|
{
|
||||||
|
struct audit_watch *watch = krule->watch;
|
||||||
|
struct audit_parent *parent = watch->parent;
|
||||||
|
|
||||||
|
list_del(&krule->rlist);
|
||||||
|
|
||||||
|
if (list_empty(&watch->rules)) {
|
||||||
|
audit_remove_watch(watch);
|
||||||
|
|
||||||
|
if (list_empty(&parent->watches)) {
|
||||||
|
/* Put parent on the inotify un-registration
|
||||||
|
* list. Grab a reference before releasing
|
||||||
|
* audit_filter_mutex, to be released in
|
||||||
|
* audit_inotify_unregister().
|
||||||
|
* If filesystem is going away, just leave
|
||||||
|
* the sucker alone, eviction will take
|
||||||
|
* care of it. */
|
||||||
|
if (pin_inotify_watch(&parent->wdata))
|
||||||
|
list_add(&parent->ilist, list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Update watch data in audit rules based on inotify events. */
|
||||||
|
static void audit_handle_ievent(struct inotify_watch *i_watch, u32 wd, u32 mask,
|
||||||
|
u32 cookie, const char *dname, struct inode *inode)
|
||||||
|
{
|
||||||
|
struct audit_parent *parent;
|
||||||
|
|
||||||
|
parent = container_of(i_watch, struct audit_parent, wdata);
|
||||||
|
|
||||||
|
if (mask & (IN_CREATE|IN_MOVED_TO) && inode)
|
||||||
|
audit_update_watch(parent, dname, inode->i_sb->s_dev,
|
||||||
|
inode->i_ino, 0);
|
||||||
|
else if (mask & (IN_DELETE|IN_MOVED_FROM))
|
||||||
|
audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1, 1);
|
||||||
|
/* inotify automatically removes the watch and sends IN_IGNORED */
|
||||||
|
else if (mask & (IN_DELETE_SELF|IN_UNMOUNT))
|
||||||
|
audit_remove_parent_watches(parent);
|
||||||
|
/* inotify does not remove the watch, so remove it manually */
|
||||||
|
else if(mask & IN_MOVE_SELF) {
|
||||||
|
audit_remove_parent_watches(parent);
|
||||||
|
inotify_remove_watch_locked(audit_ih, i_watch);
|
||||||
|
} else if (mask & IN_IGNORED)
|
||||||
|
put_inotify_watch(i_watch);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct inotify_operations audit_inotify_ops = {
|
||||||
|
.handle_event = audit_handle_ievent,
|
||||||
|
.destroy_watch = audit_free_parent,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __init audit_watch_init(void)
|
||||||
|
{
|
||||||
|
audit_ih = inotify_init(&audit_inotify_ops);
|
||||||
|
if (IS_ERR(audit_ih))
|
||||||
|
audit_panic("cannot initialize inotify handle");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
subsys_initcall(audit_watch_init);
|
@ -27,7 +27,6 @@
|
|||||||
#include <linux/namei.h>
|
#include <linux/namei.h>
|
||||||
#include <linux/netlink.h>
|
#include <linux/netlink.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/inotify.h>
|
|
||||||
#include <linux/security.h>
|
#include <linux/security.h>
|
||||||
#include "audit.h"
|
#include "audit.h"
|
||||||
|
|
||||||
@ -44,36 +43,6 @@
|
|||||||
* be written directly provided audit_filter_mutex is held.
|
* be written directly provided audit_filter_mutex is held.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* Reference counting:
|
|
||||||
*
|
|
||||||
* audit_parent: lifetime is from audit_init_parent() to receipt of an IN_IGNORED
|
|
||||||
* event. Each audit_watch holds a reference to its associated parent.
|
|
||||||
*
|
|
||||||
* audit_watch: if added to lists, lifetime is from audit_init_watch() to
|
|
||||||
* audit_remove_watch(). Additionally, an audit_watch may exist
|
|
||||||
* temporarily to assist in searching existing filter data. Each
|
|
||||||
* audit_krule holds a reference to its associated watch.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct audit_parent {
|
|
||||||
struct list_head ilist; /* entry in inotify registration list */
|
|
||||||
struct list_head watches; /* associated watches */
|
|
||||||
struct inotify_watch wdata; /* inotify watch data */
|
|
||||||
unsigned flags; /* status flags */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* audit_parent status flags:
|
|
||||||
*
|
|
||||||
* AUDIT_PARENT_INVALID - set anytime rules/watches are auto-removed due to
|
|
||||||
* a filesystem event to ensure we're adding audit watches to a valid parent.
|
|
||||||
* Technically not needed for IN_DELETE_SELF or IN_UNMOUNT events, as we cannot
|
|
||||||
* receive them while we have nameidata, but must be used for IN_MOVE_SELF which
|
|
||||||
* we can receive while holding nameidata.
|
|
||||||
*/
|
|
||||||
#define AUDIT_PARENT_INVALID 0x001
|
|
||||||
|
|
||||||
/* Audit filter lists, defined in <linux/audit.h> */
|
/* Audit filter lists, defined in <linux/audit.h> */
|
||||||
struct list_head audit_filter_list[AUDIT_NR_FILTERS] = {
|
struct list_head audit_filter_list[AUDIT_NR_FILTERS] = {
|
||||||
LIST_HEAD_INIT(audit_filter_list[0]),
|
LIST_HEAD_INIT(audit_filter_list[0]),
|
||||||
@ -97,41 +66,6 @@ static struct list_head audit_rules_list[AUDIT_NR_FILTERS] = {
|
|||||||
|
|
||||||
DEFINE_MUTEX(audit_filter_mutex);
|
DEFINE_MUTEX(audit_filter_mutex);
|
||||||
|
|
||||||
/* Inotify events we care about. */
|
|
||||||
#define AUDIT_IN_WATCH IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF
|
|
||||||
|
|
||||||
void audit_free_parent(struct inotify_watch *i_watch)
|
|
||||||
{
|
|
||||||
struct audit_parent *parent;
|
|
||||||
|
|
||||||
parent = container_of(i_watch, struct audit_parent, wdata);
|
|
||||||
WARN_ON(!list_empty(&parent->watches));
|
|
||||||
kfree(parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void audit_get_watch(struct audit_watch *watch)
|
|
||||||
{
|
|
||||||
atomic_inc(&watch->count);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void audit_put_watch(struct audit_watch *watch)
|
|
||||||
{
|
|
||||||
if (atomic_dec_and_test(&watch->count)) {
|
|
||||||
WARN_ON(watch->parent);
|
|
||||||
WARN_ON(!list_empty(&watch->rules));
|
|
||||||
kfree(watch->path);
|
|
||||||
kfree(watch);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void audit_remove_watch(struct audit_watch *watch)
|
|
||||||
{
|
|
||||||
list_del(&watch->wlist);
|
|
||||||
put_inotify_watch(&watch->parent->wdata);
|
|
||||||
watch->parent = NULL;
|
|
||||||
audit_put_watch(watch); /* match initial get */
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void audit_free_rule(struct audit_entry *e)
|
static inline void audit_free_rule(struct audit_entry *e)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -156,50 +90,6 @@ void audit_free_rule_rcu(struct rcu_head *head)
|
|||||||
audit_free_rule(e);
|
audit_free_rule(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize a parent watch entry. */
|
|
||||||
static struct audit_parent *audit_init_parent(struct nameidata *ndp)
|
|
||||||
{
|
|
||||||
struct audit_parent *parent;
|
|
||||||
s32 wd;
|
|
||||||
|
|
||||||
parent = kzalloc(sizeof(*parent), GFP_KERNEL);
|
|
||||||
if (unlikely(!parent))
|
|
||||||
return ERR_PTR(-ENOMEM);
|
|
||||||
|
|
||||||
INIT_LIST_HEAD(&parent->watches);
|
|
||||||
parent->flags = 0;
|
|
||||||
|
|
||||||
inotify_init_watch(&parent->wdata);
|
|
||||||
/* grab a ref so inotify watch hangs around until we take audit_filter_mutex */
|
|
||||||
get_inotify_watch(&parent->wdata);
|
|
||||||
wd = inotify_add_watch(audit_ih, &parent->wdata,
|
|
||||||
ndp->path.dentry->d_inode, AUDIT_IN_WATCH);
|
|
||||||
if (wd < 0) {
|
|
||||||
audit_free_parent(&parent->wdata);
|
|
||||||
return ERR_PTR(wd);
|
|
||||||
}
|
|
||||||
|
|
||||||
return parent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Initialize a watch entry. */
|
|
||||||
static struct audit_watch *audit_init_watch(char *path)
|
|
||||||
{
|
|
||||||
struct audit_watch *watch;
|
|
||||||
|
|
||||||
watch = kzalloc(sizeof(*watch), GFP_KERNEL);
|
|
||||||
if (unlikely(!watch))
|
|
||||||
return ERR_PTR(-ENOMEM);
|
|
||||||
|
|
||||||
INIT_LIST_HEAD(&watch->rules);
|
|
||||||
atomic_set(&watch->count, 1);
|
|
||||||
watch->path = path;
|
|
||||||
watch->dev = (dev_t)-1;
|
|
||||||
watch->ino = (unsigned long)-1;
|
|
||||||
|
|
||||||
return watch;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Initialize an audit filterlist entry. */
|
/* Initialize an audit filterlist entry. */
|
||||||
static inline struct audit_entry *audit_init_entry(u32 field_count)
|
static inline struct audit_entry *audit_init_entry(u32 field_count)
|
||||||
{
|
{
|
||||||
@ -260,31 +150,6 @@ static inline int audit_to_inode(struct audit_krule *krule,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Translate a watch string to kernel respresentation. */
|
|
||||||
static int audit_to_watch(struct audit_krule *krule, char *path, int len,
|
|
||||||
u32 op)
|
|
||||||
{
|
|
||||||
struct audit_watch *watch;
|
|
||||||
|
|
||||||
if (!audit_ih)
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
|
|
||||||
if (path[0] != '/' || path[len-1] == '/' ||
|
|
||||||
krule->listnr != AUDIT_FILTER_EXIT ||
|
|
||||||
op != Audit_equal ||
|
|
||||||
krule->inode_f || krule->watch || krule->tree)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
watch = audit_init_watch(path);
|
|
||||||
if (IS_ERR(watch))
|
|
||||||
return PTR_ERR(watch);
|
|
||||||
|
|
||||||
audit_get_watch(watch);
|
|
||||||
krule->watch = watch;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static __u32 *classes[AUDIT_SYSCALL_CLASSES];
|
static __u32 *classes[AUDIT_SYSCALL_CLASSES];
|
||||||
|
|
||||||
int __init audit_register_class(int class, unsigned *list)
|
int __init audit_register_class(int class, unsigned *list)
|
||||||
@ -766,7 +631,8 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule)
|
|||||||
break;
|
break;
|
||||||
case AUDIT_WATCH:
|
case AUDIT_WATCH:
|
||||||
data->buflen += data->values[i] =
|
data->buflen += data->values[i] =
|
||||||
audit_pack_string(&bufp, krule->watch->path);
|
audit_pack_string(&bufp,
|
||||||
|
audit_watch_path(krule->watch));
|
||||||
break;
|
break;
|
||||||
case AUDIT_DIR:
|
case AUDIT_DIR:
|
||||||
data->buflen += data->values[i] =
|
data->buflen += data->values[i] =
|
||||||
@ -818,7 +684,8 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
|
|||||||
return 1;
|
return 1;
|
||||||
break;
|
break;
|
||||||
case AUDIT_WATCH:
|
case AUDIT_WATCH:
|
||||||
if (strcmp(a->watch->path, b->watch->path))
|
if (strcmp(audit_watch_path(a->watch),
|
||||||
|
audit_watch_path(b->watch)))
|
||||||
return 1;
|
return 1;
|
||||||
break;
|
break;
|
||||||
case AUDIT_DIR:
|
case AUDIT_DIR:
|
||||||
@ -844,32 +711,6 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Duplicate the given audit watch. The new watch's rules list is initialized
|
|
||||||
* to an empty list and wlist is undefined. */
|
|
||||||
static struct audit_watch *audit_dupe_watch(struct audit_watch *old)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
struct audit_watch *new;
|
|
||||||
|
|
||||||
path = kstrdup(old->path, GFP_KERNEL);
|
|
||||||
if (unlikely(!path))
|
|
||||||
return ERR_PTR(-ENOMEM);
|
|
||||||
|
|
||||||
new = audit_init_watch(path);
|
|
||||||
if (IS_ERR(new)) {
|
|
||||||
kfree(path);
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
new->dev = old->dev;
|
|
||||||
new->ino = old->ino;
|
|
||||||
get_inotify_watch(&old->parent->wdata);
|
|
||||||
new->parent = old->parent;
|
|
||||||
|
|
||||||
out:
|
|
||||||
return new;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Duplicate LSM field information. The lsm_rule is opaque, so must be
|
/* Duplicate LSM field information. The lsm_rule is opaque, so must be
|
||||||
* re-initialized. */
|
* re-initialized. */
|
||||||
static inline int audit_dupe_lsm_field(struct audit_field *df,
|
static inline int audit_dupe_lsm_field(struct audit_field *df,
|
||||||
@ -904,8 +745,8 @@ static inline int audit_dupe_lsm_field(struct audit_field *df,
|
|||||||
* rule with the new rule in the filterlist, then free the old rule.
|
* rule with the new rule in the filterlist, then free the old rule.
|
||||||
* The rlist element is undefined; list manipulations are handled apart from
|
* The rlist element is undefined; list manipulations are handled apart from
|
||||||
* the initial copy. */
|
* the initial copy. */
|
||||||
static struct audit_entry *audit_dupe_rule(struct audit_krule *old,
|
struct audit_entry *audit_dupe_rule(struct audit_krule *old,
|
||||||
struct audit_watch *watch)
|
struct audit_watch *watch)
|
||||||
{
|
{
|
||||||
u32 fcount = old->field_count;
|
u32 fcount = old->field_count;
|
||||||
struct audit_entry *entry;
|
struct audit_entry *entry;
|
||||||
@ -977,137 +818,6 @@ static struct audit_entry *audit_dupe_rule(struct audit_krule *old,
|
|||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Update inode info in audit rules based on filesystem event. */
|
|
||||||
static void audit_update_watch(struct audit_parent *parent,
|
|
||||||
const char *dname, dev_t dev,
|
|
||||||
unsigned long ino, unsigned invalidating)
|
|
||||||
{
|
|
||||||
struct audit_watch *owatch, *nwatch, *nextw;
|
|
||||||
struct audit_krule *r, *nextr;
|
|
||||||
struct audit_entry *oentry, *nentry;
|
|
||||||
|
|
||||||
mutex_lock(&audit_filter_mutex);
|
|
||||||
list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) {
|
|
||||||
if (audit_compare_dname_path(dname, owatch->path, NULL))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* If the update involves invalidating rules, do the inode-based
|
|
||||||
* filtering now, so we don't omit records. */
|
|
||||||
if (invalidating && current->audit_context)
|
|
||||||
audit_filter_inodes(current, current->audit_context);
|
|
||||||
|
|
||||||
nwatch = audit_dupe_watch(owatch);
|
|
||||||
if (IS_ERR(nwatch)) {
|
|
||||||
mutex_unlock(&audit_filter_mutex);
|
|
||||||
audit_panic("error updating watch, skipping");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
nwatch->dev = dev;
|
|
||||||
nwatch->ino = ino;
|
|
||||||
|
|
||||||
list_for_each_entry_safe(r, nextr, &owatch->rules, rlist) {
|
|
||||||
|
|
||||||
oentry = container_of(r, struct audit_entry, rule);
|
|
||||||
list_del(&oentry->rule.rlist);
|
|
||||||
list_del_rcu(&oentry->list);
|
|
||||||
|
|
||||||
nentry = audit_dupe_rule(&oentry->rule, nwatch);
|
|
||||||
if (IS_ERR(nentry)) {
|
|
||||||
list_del(&oentry->rule.list);
|
|
||||||
audit_panic("error updating watch, removing");
|
|
||||||
} else {
|
|
||||||
int h = audit_hash_ino((u32)ino);
|
|
||||||
list_add(&nentry->rule.rlist, &nwatch->rules);
|
|
||||||
list_add_rcu(&nentry->list, &audit_inode_hash[h]);
|
|
||||||
list_replace(&oentry->rule.list,
|
|
||||||
&nentry->rule.list);
|
|
||||||
}
|
|
||||||
|
|
||||||
call_rcu(&oentry->rcu, audit_free_rule_rcu);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (audit_enabled) {
|
|
||||||
struct audit_buffer *ab;
|
|
||||||
ab = audit_log_start(NULL, GFP_NOFS,
|
|
||||||
AUDIT_CONFIG_CHANGE);
|
|
||||||
audit_log_format(ab, "auid=%u ses=%u",
|
|
||||||
audit_get_loginuid(current),
|
|
||||||
audit_get_sessionid(current));
|
|
||||||
audit_log_format(ab,
|
|
||||||
" op=updated rules specifying path=");
|
|
||||||
audit_log_untrustedstring(ab, owatch->path);
|
|
||||||
audit_log_format(ab, " with dev=%u ino=%lu\n",
|
|
||||||
dev, ino);
|
|
||||||
audit_log_format(ab, " list=%d res=1", r->listnr);
|
|
||||||
audit_log_end(ab);
|
|
||||||
}
|
|
||||||
audit_remove_watch(owatch);
|
|
||||||
goto add_watch_to_parent; /* event applies to a single watch */
|
|
||||||
}
|
|
||||||
mutex_unlock(&audit_filter_mutex);
|
|
||||||
return;
|
|
||||||
|
|
||||||
add_watch_to_parent:
|
|
||||||
list_add(&nwatch->wlist, &parent->watches);
|
|
||||||
mutex_unlock(&audit_filter_mutex);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Remove all watches & rules associated with a parent that is going away. */
|
|
||||||
static void audit_remove_parent_watches(struct audit_parent *parent)
|
|
||||||
{
|
|
||||||
struct audit_watch *w, *nextw;
|
|
||||||
struct audit_krule *r, *nextr;
|
|
||||||
struct audit_entry *e;
|
|
||||||
|
|
||||||
mutex_lock(&audit_filter_mutex);
|
|
||||||
parent->flags |= AUDIT_PARENT_INVALID;
|
|
||||||
list_for_each_entry_safe(w, nextw, &parent->watches, wlist) {
|
|
||||||
list_for_each_entry_safe(r, nextr, &w->rules, rlist) {
|
|
||||||
e = container_of(r, struct audit_entry, rule);
|
|
||||||
if (audit_enabled) {
|
|
||||||
struct audit_buffer *ab;
|
|
||||||
ab = audit_log_start(NULL, GFP_NOFS,
|
|
||||||
AUDIT_CONFIG_CHANGE);
|
|
||||||
audit_log_format(ab, "auid=%u ses=%u",
|
|
||||||
audit_get_loginuid(current),
|
|
||||||
audit_get_sessionid(current));
|
|
||||||
audit_log_format(ab, " op=remove rule path=");
|
|
||||||
audit_log_untrustedstring(ab, w->path);
|
|
||||||
if (r->filterkey) {
|
|
||||||
audit_log_format(ab, " key=");
|
|
||||||
audit_log_untrustedstring(ab,
|
|
||||||
r->filterkey);
|
|
||||||
} else
|
|
||||||
audit_log_format(ab, " key=(null)");
|
|
||||||
audit_log_format(ab, " list=%d res=1",
|
|
||||||
r->listnr);
|
|
||||||
audit_log_end(ab);
|
|
||||||
}
|
|
||||||
list_del(&r->rlist);
|
|
||||||
list_del(&r->list);
|
|
||||||
list_del_rcu(&e->list);
|
|
||||||
call_rcu(&e->rcu, audit_free_rule_rcu);
|
|
||||||
}
|
|
||||||
audit_remove_watch(w);
|
|
||||||
}
|
|
||||||
mutex_unlock(&audit_filter_mutex);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unregister inotify watches for parents on in_list.
|
|
||||||
* Generates an IN_IGNORED event. */
|
|
||||||
static void audit_inotify_unregister(struct list_head *in_list)
|
|
||||||
{
|
|
||||||
struct audit_parent *p, *n;
|
|
||||||
|
|
||||||
list_for_each_entry_safe(p, n, in_list, ilist) {
|
|
||||||
list_del(&p->ilist);
|
|
||||||
inotify_rm_watch(audit_ih, &p->wdata);
|
|
||||||
/* the unpin matching the pin in audit_do_del_rule() */
|
|
||||||
unpin_inotify_watch(&p->wdata);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Find an existing audit rule.
|
/* Find an existing audit rule.
|
||||||
* Caller must hold audit_filter_mutex to prevent stale rule data. */
|
* Caller must hold audit_filter_mutex to prevent stale rule data. */
|
||||||
static struct audit_entry *audit_find_rule(struct audit_entry *entry,
|
static struct audit_entry *audit_find_rule(struct audit_entry *entry,
|
||||||
@ -1145,134 +855,6 @@ static struct audit_entry *audit_find_rule(struct audit_entry *entry,
|
|||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get path information necessary for adding watches. */
|
|
||||||
static int audit_get_nd(char *path, struct nameidata **ndp,
|
|
||||||
struct nameidata **ndw)
|
|
||||||
{
|
|
||||||
struct nameidata *ndparent, *ndwatch;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
ndparent = kmalloc(sizeof(*ndparent), GFP_KERNEL);
|
|
||||||
if (unlikely(!ndparent))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
ndwatch = kmalloc(sizeof(*ndwatch), GFP_KERNEL);
|
|
||||||
if (unlikely(!ndwatch)) {
|
|
||||||
kfree(ndparent);
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
err = path_lookup(path, LOOKUP_PARENT, ndparent);
|
|
||||||
if (err) {
|
|
||||||
kfree(ndparent);
|
|
||||||
kfree(ndwatch);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
err = path_lookup(path, 0, ndwatch);
|
|
||||||
if (err) {
|
|
||||||
kfree(ndwatch);
|
|
||||||
ndwatch = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
*ndp = ndparent;
|
|
||||||
*ndw = ndwatch;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Release resources used for watch path information. */
|
|
||||||
static void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw)
|
|
||||||
{
|
|
||||||
if (ndp) {
|
|
||||||
path_put(&ndp->path);
|
|
||||||
kfree(ndp);
|
|
||||||
}
|
|
||||||
if (ndw) {
|
|
||||||
path_put(&ndw->path);
|
|
||||||
kfree(ndw);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Associate the given rule with an existing parent inotify_watch.
|
|
||||||
* Caller must hold audit_filter_mutex. */
|
|
||||||
static void audit_add_to_parent(struct audit_krule *krule,
|
|
||||||
struct audit_parent *parent)
|
|
||||||
{
|
|
||||||
struct audit_watch *w, *watch = krule->watch;
|
|
||||||
int watch_found = 0;
|
|
||||||
|
|
||||||
list_for_each_entry(w, &parent->watches, wlist) {
|
|
||||||
if (strcmp(watch->path, w->path))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
watch_found = 1;
|
|
||||||
|
|
||||||
/* put krule's and initial refs to temporary watch */
|
|
||||||
audit_put_watch(watch);
|
|
||||||
audit_put_watch(watch);
|
|
||||||
|
|
||||||
audit_get_watch(w);
|
|
||||||
krule->watch = watch = w;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!watch_found) {
|
|
||||||
get_inotify_watch(&parent->wdata);
|
|
||||||
watch->parent = parent;
|
|
||||||
|
|
||||||
list_add(&watch->wlist, &parent->watches);
|
|
||||||
}
|
|
||||||
list_add(&krule->rlist, &watch->rules);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Find a matching watch entry, or add this one.
|
|
||||||
* Caller must hold audit_filter_mutex. */
|
|
||||||
static int audit_add_watch(struct audit_krule *krule, struct nameidata *ndp,
|
|
||||||
struct nameidata *ndw)
|
|
||||||
{
|
|
||||||
struct audit_watch *watch = krule->watch;
|
|
||||||
struct inotify_watch *i_watch;
|
|
||||||
struct audit_parent *parent;
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
/* update watch filter fields */
|
|
||||||
if (ndw) {
|
|
||||||
watch->dev = ndw->path.dentry->d_inode->i_sb->s_dev;
|
|
||||||
watch->ino = ndw->path.dentry->d_inode->i_ino;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The audit_filter_mutex must not be held during inotify calls because
|
|
||||||
* we hold it during inotify event callback processing. If an existing
|
|
||||||
* inotify watch is found, inotify_find_watch() grabs a reference before
|
|
||||||
* returning.
|
|
||||||
*/
|
|
||||||
mutex_unlock(&audit_filter_mutex);
|
|
||||||
|
|
||||||
if (inotify_find_watch(audit_ih, ndp->path.dentry->d_inode,
|
|
||||||
&i_watch) < 0) {
|
|
||||||
parent = audit_init_parent(ndp);
|
|
||||||
if (IS_ERR(parent)) {
|
|
||||||
/* caller expects mutex locked */
|
|
||||||
mutex_lock(&audit_filter_mutex);
|
|
||||||
return PTR_ERR(parent);
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
parent = container_of(i_watch, struct audit_parent, wdata);
|
|
||||||
|
|
||||||
mutex_lock(&audit_filter_mutex);
|
|
||||||
|
|
||||||
/* parent was moved before we took audit_filter_mutex */
|
|
||||||
if (parent->flags & AUDIT_PARENT_INVALID)
|
|
||||||
ret = -ENOENT;
|
|
||||||
else
|
|
||||||
audit_add_to_parent(krule, parent);
|
|
||||||
|
|
||||||
/* match get in audit_init_parent or inotify_find_watch */
|
|
||||||
put_inotify_watch(&parent->wdata);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static u64 prio_low = ~0ULL/2;
|
static u64 prio_low = ~0ULL/2;
|
||||||
static u64 prio_high = ~0ULL/2 - 1;
|
static u64 prio_high = ~0ULL/2 - 1;
|
||||||
|
|
||||||
@ -1282,7 +864,6 @@ static inline int audit_add_rule(struct audit_entry *entry)
|
|||||||
struct audit_entry *e;
|
struct audit_entry *e;
|
||||||
struct audit_watch *watch = entry->rule.watch;
|
struct audit_watch *watch = entry->rule.watch;
|
||||||
struct audit_tree *tree = entry->rule.tree;
|
struct audit_tree *tree = entry->rule.tree;
|
||||||
struct nameidata *ndp = NULL, *ndw = NULL;
|
|
||||||
struct list_head *list;
|
struct list_head *list;
|
||||||
int h, err;
|
int h, err;
|
||||||
#ifdef CONFIG_AUDITSYSCALL
|
#ifdef CONFIG_AUDITSYSCALL
|
||||||
@ -1296,8 +877,8 @@ static inline int audit_add_rule(struct audit_entry *entry)
|
|||||||
|
|
||||||
mutex_lock(&audit_filter_mutex);
|
mutex_lock(&audit_filter_mutex);
|
||||||
e = audit_find_rule(entry, &list);
|
e = audit_find_rule(entry, &list);
|
||||||
mutex_unlock(&audit_filter_mutex);
|
|
||||||
if (e) {
|
if (e) {
|
||||||
|
mutex_unlock(&audit_filter_mutex);
|
||||||
err = -EEXIST;
|
err = -EEXIST;
|
||||||
/* normally audit_add_tree_rule() will free it on failure */
|
/* normally audit_add_tree_rule() will free it on failure */
|
||||||
if (tree)
|
if (tree)
|
||||||
@ -1305,22 +886,16 @@ static inline int audit_add_rule(struct audit_entry *entry)
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Avoid calling path_lookup under audit_filter_mutex. */
|
|
||||||
if (watch) {
|
|
||||||
err = audit_get_nd(watch->path, &ndp, &ndw);
|
|
||||||
if (err)
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
mutex_lock(&audit_filter_mutex);
|
|
||||||
if (watch) {
|
if (watch) {
|
||||||
/* audit_filter_mutex is dropped and re-taken during this call */
|
/* audit_filter_mutex is dropped and re-taken during this call */
|
||||||
err = audit_add_watch(&entry->rule, ndp, ndw);
|
err = audit_add_watch(&entry->rule);
|
||||||
if (err) {
|
if (err) {
|
||||||
mutex_unlock(&audit_filter_mutex);
|
mutex_unlock(&audit_filter_mutex);
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
h = audit_hash_ino((u32)watch->ino);
|
/* entry->rule.watch may have changed during audit_add_watch() */
|
||||||
|
watch = entry->rule.watch;
|
||||||
|
h = audit_hash_ino((u32)audit_watch_inode(watch));
|
||||||
list = &audit_inode_hash[h];
|
list = &audit_inode_hash[h];
|
||||||
}
|
}
|
||||||
if (tree) {
|
if (tree) {
|
||||||
@ -1358,11 +933,9 @@ static inline int audit_add_rule(struct audit_entry *entry)
|
|||||||
#endif
|
#endif
|
||||||
mutex_unlock(&audit_filter_mutex);
|
mutex_unlock(&audit_filter_mutex);
|
||||||
|
|
||||||
audit_put_nd(ndp, ndw); /* NULL args OK */
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
audit_put_nd(ndp, ndw); /* NULL args OK */
|
|
||||||
if (watch)
|
if (watch)
|
||||||
audit_put_watch(watch); /* tmp watch, matches initial get */
|
audit_put_watch(watch); /* tmp watch, matches initial get */
|
||||||
return err;
|
return err;
|
||||||
@ -1372,7 +945,7 @@ static inline int audit_add_rule(struct audit_entry *entry)
|
|||||||
static inline int audit_del_rule(struct audit_entry *entry)
|
static inline int audit_del_rule(struct audit_entry *entry)
|
||||||
{
|
{
|
||||||
struct audit_entry *e;
|
struct audit_entry *e;
|
||||||
struct audit_watch *watch, *tmp_watch = entry->rule.watch;
|
struct audit_watch *watch = entry->rule.watch;
|
||||||
struct audit_tree *tree = entry->rule.tree;
|
struct audit_tree *tree = entry->rule.tree;
|
||||||
struct list_head *list;
|
struct list_head *list;
|
||||||
LIST_HEAD(inotify_list);
|
LIST_HEAD(inotify_list);
|
||||||
@ -1394,29 +967,8 @@ static inline int audit_del_rule(struct audit_entry *entry)
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
watch = e->rule.watch;
|
if (e->rule.watch)
|
||||||
if (watch) {
|
audit_remove_watch_rule(&e->rule, &inotify_list);
|
||||||
struct audit_parent *parent = watch->parent;
|
|
||||||
|
|
||||||
list_del(&e->rule.rlist);
|
|
||||||
|
|
||||||
if (list_empty(&watch->rules)) {
|
|
||||||
audit_remove_watch(watch);
|
|
||||||
|
|
||||||
if (list_empty(&parent->watches)) {
|
|
||||||
/* Put parent on the inotify un-registration
|
|
||||||
* list. Grab a reference before releasing
|
|
||||||
* audit_filter_mutex, to be released in
|
|
||||||
* audit_inotify_unregister().
|
|
||||||
* If filesystem is going away, just leave
|
|
||||||
* the sucker alone, eviction will take
|
|
||||||
* care of it.
|
|
||||||
*/
|
|
||||||
if (pin_inotify_watch(&parent->wdata))
|
|
||||||
list_add(&parent->ilist, &inotify_list);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e->rule.tree)
|
if (e->rule.tree)
|
||||||
audit_remove_tree_rule(&e->rule);
|
audit_remove_tree_rule(&e->rule);
|
||||||
@ -1438,8 +990,8 @@ static inline int audit_del_rule(struct audit_entry *entry)
|
|||||||
audit_inotify_unregister(&inotify_list);
|
audit_inotify_unregister(&inotify_list);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (tmp_watch)
|
if (watch)
|
||||||
audit_put_watch(tmp_watch); /* match initial get */
|
audit_put_watch(watch); /* match initial get */
|
||||||
if (tree)
|
if (tree)
|
||||||
audit_put_tree(tree); /* that's the temporary one */
|
audit_put_tree(tree); /* that's the temporary one */
|
||||||
|
|
||||||
@ -1527,11 +1079,9 @@ static void audit_log_rule_change(uid_t loginuid, u32 sessionid, u32 sid,
|
|||||||
security_release_secctx(ctx, len);
|
security_release_secctx(ctx, len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
audit_log_format(ab, " op=%s rule key=", action);
|
audit_log_format(ab, " op=");
|
||||||
if (rule->filterkey)
|
audit_log_string(ab, action);
|
||||||
audit_log_untrustedstring(ab, rule->filterkey);
|
audit_log_key(ab, rule->filterkey);
|
||||||
else
|
|
||||||
audit_log_format(ab, "(null)");
|
|
||||||
audit_log_format(ab, " list=%d res=%d", rule->listnr, res);
|
audit_log_format(ab, " list=%d res=%d", rule->listnr, res);
|
||||||
audit_log_end(ab);
|
audit_log_end(ab);
|
||||||
}
|
}
|
||||||
@ -1595,7 +1145,7 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
|
|||||||
return PTR_ERR(entry);
|
return PTR_ERR(entry);
|
||||||
|
|
||||||
err = audit_add_rule(entry);
|
err = audit_add_rule(entry);
|
||||||
audit_log_rule_change(loginuid, sessionid, sid, "add",
|
audit_log_rule_change(loginuid, sessionid, sid, "add rule",
|
||||||
&entry->rule, !err);
|
&entry->rule, !err);
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
@ -1611,7 +1161,7 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
|
|||||||
return PTR_ERR(entry);
|
return PTR_ERR(entry);
|
||||||
|
|
||||||
err = audit_del_rule(entry);
|
err = audit_del_rule(entry);
|
||||||
audit_log_rule_change(loginuid, sessionid, sid, "remove",
|
audit_log_rule_change(loginuid, sessionid, sid, "remove rule",
|
||||||
&entry->rule, !err);
|
&entry->rule, !err);
|
||||||
|
|
||||||
audit_free_rule(entry);
|
audit_free_rule(entry);
|
||||||
@ -1793,7 +1343,7 @@ static int update_lsm_rule(struct audit_krule *r)
|
|||||||
list_del(&r->list);
|
list_del(&r->list);
|
||||||
} else {
|
} else {
|
||||||
if (watch) {
|
if (watch) {
|
||||||
list_add(&nentry->rule.rlist, &watch->rules);
|
list_add(&nentry->rule.rlist, audit_watch_rules(watch));
|
||||||
list_del(&r->rlist);
|
list_del(&r->rlist);
|
||||||
} else if (tree)
|
} else if (tree)
|
||||||
list_replace_init(&r->rlist, &nentry->rule.rlist);
|
list_replace_init(&r->rlist, &nentry->rule.rlist);
|
||||||
@ -1829,27 +1379,3 @@ int audit_update_lsm_rules(void)
|
|||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Update watch data in audit rules based on inotify events. */
|
|
||||||
void audit_handle_ievent(struct inotify_watch *i_watch, u32 wd, u32 mask,
|
|
||||||
u32 cookie, const char *dname, struct inode *inode)
|
|
||||||
{
|
|
||||||
struct audit_parent *parent;
|
|
||||||
|
|
||||||
parent = container_of(i_watch, struct audit_parent, wdata);
|
|
||||||
|
|
||||||
if (mask & (IN_CREATE|IN_MOVED_TO) && inode)
|
|
||||||
audit_update_watch(parent, dname, inode->i_sb->s_dev,
|
|
||||||
inode->i_ino, 0);
|
|
||||||
else if (mask & (IN_DELETE|IN_MOVED_FROM))
|
|
||||||
audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1, 1);
|
|
||||||
/* inotify automatically removes the watch and sends IN_IGNORED */
|
|
||||||
else if (mask & (IN_DELETE_SELF|IN_UNMOUNT))
|
|
||||||
audit_remove_parent_watches(parent);
|
|
||||||
/* inotify does not remove the watch, so remove it manually */
|
|
||||||
else if(mask & IN_MOVE_SELF) {
|
|
||||||
audit_remove_parent_watches(parent);
|
|
||||||
inotify_remove_watch_locked(audit_ih, i_watch);
|
|
||||||
} else if (mask & IN_IGNORED)
|
|
||||||
put_inotify_watch(i_watch);
|
|
||||||
}
|
|
||||||
|
@ -199,6 +199,7 @@ struct audit_context {
|
|||||||
|
|
||||||
struct audit_tree_refs *trees, *first_trees;
|
struct audit_tree_refs *trees, *first_trees;
|
||||||
int tree_count;
|
int tree_count;
|
||||||
|
struct list_head killed_trees;
|
||||||
|
|
||||||
int type;
|
int type;
|
||||||
union {
|
union {
|
||||||
@ -548,9 +549,9 @@ static int audit_filter_rules(struct task_struct *tsk,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case AUDIT_WATCH:
|
case AUDIT_WATCH:
|
||||||
if (name && rule->watch->ino != (unsigned long)-1)
|
if (name && audit_watch_inode(rule->watch) != (unsigned long)-1)
|
||||||
result = (name->dev == rule->watch->dev &&
|
result = (name->dev == audit_watch_dev(rule->watch) &&
|
||||||
name->ino == rule->watch->ino);
|
name->ino == audit_watch_inode(rule->watch));
|
||||||
break;
|
break;
|
||||||
case AUDIT_DIR:
|
case AUDIT_DIR:
|
||||||
if (ctx)
|
if (ctx)
|
||||||
@ -853,6 +854,7 @@ static inline struct audit_context *audit_alloc_context(enum audit_state state)
|
|||||||
if (!(context = kmalloc(sizeof(*context), GFP_KERNEL)))
|
if (!(context = kmalloc(sizeof(*context), GFP_KERNEL)))
|
||||||
return NULL;
|
return NULL;
|
||||||
audit_zero_context(context, state);
|
audit_zero_context(context, state);
|
||||||
|
INIT_LIST_HEAD(&context->killed_trees);
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1024,8 +1026,8 @@ static int audit_log_single_execve_arg(struct audit_context *context,
|
|||||||
{
|
{
|
||||||
char arg_num_len_buf[12];
|
char arg_num_len_buf[12];
|
||||||
const char __user *tmp_p = p;
|
const char __user *tmp_p = p;
|
||||||
/* how many digits are in arg_num? 3 is the length of " a=" */
|
/* how many digits are in arg_num? 5 is the length of ' a=""' */
|
||||||
size_t arg_num_len = snprintf(arg_num_len_buf, 12, "%d", arg_num) + 3;
|
size_t arg_num_len = snprintf(arg_num_len_buf, 12, "%d", arg_num) + 5;
|
||||||
size_t len, len_left, to_send;
|
size_t len, len_left, to_send;
|
||||||
size_t max_execve_audit_len = MAX_EXECVE_AUDIT_LEN;
|
size_t max_execve_audit_len = MAX_EXECVE_AUDIT_LEN;
|
||||||
unsigned int i, has_cntl = 0, too_long = 0;
|
unsigned int i, has_cntl = 0, too_long = 0;
|
||||||
@ -1137,7 +1139,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
|
|||||||
if (has_cntl)
|
if (has_cntl)
|
||||||
audit_log_n_hex(*ab, buf, to_send);
|
audit_log_n_hex(*ab, buf, to_send);
|
||||||
else
|
else
|
||||||
audit_log_format(*ab, "\"%s\"", buf);
|
audit_log_string(*ab, buf);
|
||||||
|
|
||||||
p += to_send;
|
p += to_send;
|
||||||
len_left -= to_send;
|
len_left -= to_send;
|
||||||
@ -1372,11 +1374,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
|
|||||||
|
|
||||||
|
|
||||||
audit_log_task_info(ab, tsk);
|
audit_log_task_info(ab, tsk);
|
||||||
if (context->filterkey) {
|
audit_log_key(ab, context->filterkey);
|
||||||
audit_log_format(ab, " key=");
|
|
||||||
audit_log_untrustedstring(ab, context->filterkey);
|
|
||||||
} else
|
|
||||||
audit_log_format(ab, " key=(null)");
|
|
||||||
audit_log_end(ab);
|
audit_log_end(ab);
|
||||||
|
|
||||||
for (aux = context->aux; aux; aux = aux->next) {
|
for (aux = context->aux; aux; aux = aux->next) {
|
||||||
@ -1549,6 +1547,8 @@ void audit_free(struct task_struct *tsk)
|
|||||||
/* that can happen only if we are called from do_exit() */
|
/* that can happen only if we are called from do_exit() */
|
||||||
if (context->in_syscall && context->current_state == AUDIT_RECORD_CONTEXT)
|
if (context->in_syscall && context->current_state == AUDIT_RECORD_CONTEXT)
|
||||||
audit_log_exit(context, tsk);
|
audit_log_exit(context, tsk);
|
||||||
|
if (!list_empty(&context->killed_trees))
|
||||||
|
audit_kill_trees(&context->killed_trees);
|
||||||
|
|
||||||
audit_free_context(context);
|
audit_free_context(context);
|
||||||
}
|
}
|
||||||
@ -1692,6 +1692,9 @@ void audit_syscall_exit(int valid, long return_code)
|
|||||||
context->in_syscall = 0;
|
context->in_syscall = 0;
|
||||||
context->prio = context->state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
|
context->prio = context->state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
|
||||||
|
|
||||||
|
if (!list_empty(&context->killed_trees))
|
||||||
|
audit_kill_trees(&context->killed_trees);
|
||||||
|
|
||||||
if (context->previous) {
|
if (context->previous) {
|
||||||
struct audit_context *new_context = context->previous;
|
struct audit_context *new_context = context->previous;
|
||||||
context->previous = NULL;
|
context->previous = NULL;
|
||||||
@ -2525,3 +2528,11 @@ void audit_core_dumps(long signr)
|
|||||||
audit_log_format(ab, " sig=%ld", signr);
|
audit_log_format(ab, " sig=%ld", signr);
|
||||||
audit_log_end(ab);
|
audit_log_end(ab);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct list_head *audit_killed_trees(void)
|
||||||
|
{
|
||||||
|
struct audit_context *ctx = current->audit_context;
|
||||||
|
if (likely(!ctx || !ctx->in_syscall))
|
||||||
|
return NULL;
|
||||||
|
return &ctx->killed_trees;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user