redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/audit 

Pull audit updates from Paul Moore:
 "Fourteen audit patches for v4.12 that span the full range of fixes,
  new features, and internal cleanups.

  We have a patches to move to 64-bit timestamps, convert refcounts from
  atomic_t to refcount_t, track PIDs using the pid struct instead of
  pid_t, convert our own private audit buffer cache to a standard
  kmem_cache, log kernel module names when they are unloaded, and
  normalize the NETFILTER_PKT to make the userspace folks happier.

  From a fixes perspective, the most important is likely the auditd
  connection tracking RCU fix; it was a rather brain dead bug that I'll
  take the blame for, but thankfully it didn't seem to affect many
  people (only one report).

  I think the patch subject lines and commit descriptions do a pretty
  good job of explaining the details and why the changes are important
  so I'll point you there instead of duplicating it here; as usual, if
  you have any questions you know where to find us.

  We also manage to take out more code than we put in this time, that
  always makes me happy :)"

* 'stable-4.12' of git://git.infradead.org/users/pcmoore/audit:
  audit: fix the RCU locking for the auditd_connection structure
  audit: use kmem_cache to manage the audit_buffer cache
  audit: Use timespec64 to represent audit timestamps
  audit: store the auditd PID as a pid struct instead of pid_t
  audit: kernel generated netlink traffic should have a portid of 0
  audit: combine audit_receive() and audit_receive_skb()
  audit: convert audit_watch.count from atomic_t to refcount_t
  audit: convert audit_tree.count from atomic_t to refcount_t
  audit: normalize NETFILTER_PKT
  netfilter: use consistent ipv4 network offset in xt_AUDIT
  audit: log module name on delete_module
  audit: remove unnecessary semicolon in audit_watch_handle_event()
  audit: remove unnecessary semicolon in audit_mark_handle_event()
  audit: remove unnecessary semicolon in audit_field_valid()
zero-colors
Linus Torvalds 2017-05-03 09:21:59 -07:00
parent 0302e28dee 48d0e023af
commit 46f0537b1e
10 changed files with 233 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/audit.h
View File

@ -163,8 +163,7 @@ extern void audit_log_task_info(struct audit_buffer *ab,
extern int audit_update_lsm_rules(void); extern int audit_update_lsm_rules(void);
/* Private API (for audit.c only) */ /* Private API (for audit.c only) */
extern int audit_rule_change(int type, __u32 portid, int seq, extern int audit_rule_change(int type, int seq, void *data, size_t datasz);
void *data, size_t datasz);
extern int audit_list_rules_send(struct sk_buff *request_skb, int seq); extern int audit_list_rules_send(struct sk_buff *request_skb, int seq);
extern u32 audit_enabled; extern u32 audit_enabled;
@ -332,7 +331,7 @@ static inline void audit_ptrace(struct task_struct *t)
/* Private API (for audit.c only) */ /* Private API (for audit.c only) */
extern unsigned int audit_serial(void); extern unsigned int audit_serial(void);
extern int auditsc_get_stamp(struct audit_context *ctx, extern int auditsc_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial); struct timespec64 *t, unsigned int *serial);
extern int audit_set_loginuid(kuid_t loginuid); extern int audit_set_loginuid(kuid_t loginuid);
static inline kuid_t audit_get_loginuid(struct task_struct *tsk) static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
@ -511,7 +510,7 @@ static inline void __audit_seccomp(unsigned long syscall, long signr, int code)
static inline void audit_seccomp(unsigned long syscall, long signr, int code) static inline void audit_seccomp(unsigned long syscall, long signr, int code)
{ } { }
static inline int auditsc_get_stamp(struct audit_context *ctx, static inline int auditsc_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial) struct timespec64 *t, unsigned int *serial)
{ {
return 0; return 0;
} }

319
kernel/audit.c
View File

@ -58,6 +58,8 @@
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/pid.h>
#include <linux/slab.h>
#include <linux/audit.h> #include <linux/audit.h>
@ -110,18 +112,19 @@ struct audit_net {
* @pid: auditd PID * @pid: auditd PID
* @portid: netlink portid * @portid: netlink portid
* @net: the associated network namespace * @net: the associated network namespace
* @lock: spinlock to protect write access * @rcu: RCU head
* *
* Description: * Description:
* This struct is RCU protected; you must either hold the RCU lock for reading * This struct is RCU protected; you must either hold the RCU lock for reading
* or the included spinlock for writing. * or the associated spinlock for writing.
*/ */
static struct auditd_connection { static struct auditd_connection {
int pid; struct pid *pid;
u32 portid; u32 portid;
struct net *net; struct net *net;
spinlock_t lock; struct rcu_head rcu;
} auditd_conn; } *auditd_conn = NULL;
static DEFINE_SPINLOCK(auditd_conn_lock);
/* If audit_rate_limit is non-zero, limit the rate of sending audit records /* If audit_rate_limit is non-zero, limit the rate of sending audit records
* to that number per second. This prevents DoS attacks, but results in * to that number per second. This prevents DoS attacks, but results in
@ -151,12 +154,7 @@ static atomic_t audit_lost = ATOMIC_INIT(0);
/* 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];
/* The audit_freelist is a list of pre-allocated audit buffers (if more static struct kmem_cache *audit_buffer_cache;
* than AUDIT_MAXFREE are in use, the audit buffer is freed instead of
* being placed on the freelist). */
static DEFINE_SPINLOCK(audit_freelist_lock);
static int audit_freelist_count;
static LIST_HEAD(audit_freelist);
/* queue msgs to send via kauditd_task */ /* queue msgs to send via kauditd_task */
static struct sk_buff_head audit_queue; static struct sk_buff_head audit_queue;
@ -191,17 +189,12 @@ DEFINE_MUTEX(audit_cmd_mutex);
* should be at least that large. */ * should be at least that large. */
#define AUDIT_BUFSIZ 1024 #define AUDIT_BUFSIZ 1024
/* 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)
/* The audit_buffer is used when formatting an audit record. The caller /* The audit_buffer is used when formatting an audit record. The caller
* locks briefly to get the record off the freelist or to allocate the * locks briefly to get the record off the freelist or to allocate the
* buffer, and locks briefly to send the buffer to the netlink layer or * buffer, and locks briefly to send the buffer to the netlink layer or
* to place it on a transmit queue. Multiple audit_buffers can be in * to place it on a transmit queue. Multiple audit_buffers can be in
* use simultaneously. */ * use simultaneously. */
struct audit_buffer { struct audit_buffer {
struct list_head list;
struct sk_buff *skb; /* formatted skb ready to send */ struct sk_buff *skb; /* formatted skb ready to send */
struct audit_context *ctx; /* NULL or associated context */ struct audit_context *ctx; /* NULL or associated context */
gfp_t gfp_mask; gfp_t gfp_mask;
@ -220,17 +213,41 @@ struct audit_reply {
* Description: * Description:
* Return 1 if the task is a registered audit daemon, 0 otherwise. * Return 1 if the task is a registered audit daemon, 0 otherwise.
*/ */
int auditd_test_task(const struct task_struct *task) int auditd_test_task(struct task_struct *task)
{ {
int rc; int rc;
struct auditd_connection *ac;
rcu_read_lock(); rcu_read_lock();
rc = (auditd_conn.pid && task->tgid == auditd_conn.pid ? 1 : 0); ac = rcu_dereference(auditd_conn);
rc = (ac && ac->pid == task_tgid(task) ? 1 : 0);
rcu_read_unlock(); rcu_read_unlock();
return rc; return rc;
} }
/**
* auditd_pid_vnr - Return the auditd PID relative to the namespace
*
* Description:
* Returns the PID in relation to the namespace, 0 on failure.
*/
static pid_t auditd_pid_vnr(void)
{
pid_t pid;
const struct auditd_connection *ac;
rcu_read_lock();
ac = rcu_dereference(auditd_conn);
if (!ac || !ac->pid)
pid = 0;
else
pid = pid_vnr(ac->pid);
rcu_read_unlock();
return pid;
}
/** /**
* audit_get_sk - Return the audit socket for the given network namespace * audit_get_sk - Return the audit socket for the given network namespace
* @net: the destination network namespace * @net: the destination network namespace
@ -250,14 +267,6 @@ static struct sock *audit_get_sk(const struct net *net)
return aunet->sk; return aunet->sk;
} }
static void audit_set_portid(struct audit_buffer *ab, __u32 portid)
{
if (ab) {
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
nlh->nlmsg_pid = portid;
}
}
void audit_panic(const char *message) void audit_panic(const char *message)
{ {
switch (audit_failure) { switch (audit_failure) {
@ -426,6 +435,24 @@ static int audit_set_failure(u32 state)
return audit_do_config_change("audit_failure", &audit_failure, state); return audit_do_config_change("audit_failure", &audit_failure, state);
} }
/**
* auditd_conn_free - RCU helper to release an auditd connection struct
* @rcu: RCU head
*
* Description:
* Drop any references inside the auditd connection tracking struct and free
* the memory.
*/
static void auditd_conn_free(struct rcu_head *rcu)
{
struct auditd_connection *ac;
ac = container_of(rcu, struct auditd_connection, rcu);
put_pid(ac->pid);
put_net(ac->net);
kfree(ac);
}
/** /**
* auditd_set - Set/Reset the auditd connection state * auditd_set - Set/Reset the auditd connection state
* @pid: auditd PID * @pid: auditd PID
@ -434,22 +461,33 @@ static int audit_set_failure(u32 state)
* *
* Description: * Description:
* This function will obtain and drop network namespace references as * This function will obtain and drop network namespace references as
* necessary. * necessary. Returns zero on success, negative values on failure.
*/ */
static void auditd_set(int pid, u32 portid, struct net *net) static int auditd_set(struct pid *pid, u32 portid, struct net *net)
{ {
unsigned long flags; unsigned long flags;
struct auditd_connection *ac_old, *ac_new;
spin_lock_irqsave(&auditd_conn.lock, flags); if (!pid || !net)
auditd_conn.pid = pid; return -EINVAL;
auditd_conn.portid = portid;
if (auditd_conn.net) ac_new = kzalloc(sizeof(*ac_new), GFP_KERNEL);
put_net(auditd_conn.net); if (!ac_new)
if (net) return -ENOMEM;
auditd_conn.net = get_net(net); ac_new->pid = get_pid(pid);
else ac_new->portid = portid;
auditd_conn.net = NULL; ac_new->net = get_net(net);
spin_unlock_irqrestore(&auditd_conn.lock, flags);
spin_lock_irqsave(&auditd_conn_lock, flags);
ac_old = rcu_dereference_protected(auditd_conn,
lockdep_is_held(&auditd_conn_lock));
rcu_assign_pointer(auditd_conn, ac_new);
spin_unlock_irqrestore(&auditd_conn_lock, flags);
if (ac_old)
call_rcu(&ac_old->rcu, auditd_conn_free);
return 0;
} }
/** /**
@ -544,13 +582,19 @@ static void kauditd_retry_skb(struct sk_buff *skb)
*/ */
static void auditd_reset(void) static void auditd_reset(void)
{ {
unsigned long flags;
struct sk_buff *skb; struct sk_buff *skb;
struct auditd_connection *ac_old;
/* if it isn't already broken, break the connection */ /* if it isn't already broken, break the connection */
rcu_read_lock(); spin_lock_irqsave(&auditd_conn_lock, flags);
if (auditd_conn.pid) ac_old = rcu_dereference_protected(auditd_conn,
auditd_set(0, 0, NULL); lockdep_is_held(&auditd_conn_lock));
rcu_read_unlock(); rcu_assign_pointer(auditd_conn, NULL);
spin_unlock_irqrestore(&auditd_conn_lock, flags);
if (ac_old)
call_rcu(&ac_old->rcu, auditd_conn_free);
/* flush all of the main and retry queues to the hold queue */ /* flush all of the main and retry queues to the hold queue */
while ((skb = skb_dequeue(&audit_retry_queue))) while ((skb = skb_dequeue(&audit_retry_queue)))
@ -576,6 +620,7 @@ static int auditd_send_unicast_skb(struct sk_buff *skb)
u32 portid; u32 portid;
struct net *net; struct net *net;
struct sock *sk; struct sock *sk;
struct auditd_connection *ac;
/* NOTE: we can't call netlink_unicast while in the RCU section so /* NOTE: we can't call netlink_unicast while in the RCU section so
* take a reference to the network namespace and grab local * take a reference to the network namespace and grab local
@ -585,15 +630,15 @@ static int auditd_send_unicast_skb(struct sk_buff *skb)
* section netlink_unicast() should safely return an error */ * section netlink_unicast() should safely return an error */
rcu_read_lock(); rcu_read_lock();
if (!auditd_conn.pid) { ac = rcu_dereference(auditd_conn);
if (!ac) {
rcu_read_unlock(); rcu_read_unlock();
rc = -ECONNREFUSED; rc = -ECONNREFUSED;
goto err; goto err;
} }
net = auditd_conn.net; net = get_net(ac->net);
get_net(net);
sk = audit_get_sk(net); sk = audit_get_sk(net);
portid = auditd_conn.portid; portid = ac->portid;
rcu_read_unlock(); rcu_read_unlock();
rc = netlink_unicast(sk, skb, portid, 0); rc = netlink_unicast(sk, skb, portid, 0);
@ -728,6 +773,7 @@ static int kauditd_thread(void *dummy)
u32 portid = 0; u32 portid = 0;
struct net *net = NULL; struct net *net = NULL;
struct sock *sk = NULL; struct sock *sk = NULL;
struct auditd_connection *ac;
#define UNICAST_RETRIES 5 #define UNICAST_RETRIES 5
@ -735,14 +781,14 @@ static int kauditd_thread(void *dummy)
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
/* NOTE: see the lock comments in auditd_send_unicast_skb() */ /* NOTE: see the lock comments in auditd_send_unicast_skb() */
rcu_read_lock(); rcu_read_lock();
if (!auditd_conn.pid) { ac = rcu_dereference(auditd_conn);
if (!ac) {
rcu_read_unlock(); rcu_read_unlock();
goto main_queue; goto main_queue;
} }
net = auditd_conn.net; net = get_net(ac->net);
get_net(net);
sk = audit_get_sk(net); sk = audit_get_sk(net);
portid = auditd_conn.portid; portid = ac->portid;
rcu_read_unlock(); rcu_read_unlock();
/* attempt to flush the hold queue */ /* attempt to flush the hold queue */
@ -816,7 +862,7 @@ int audit_send_list(void *_dest)
return 0; return 0;
} }
struct sk_buff *audit_make_reply(__u32 portid, int seq, int type, int done, struct sk_buff *audit_make_reply(int seq, int type, int done,
int multi, const void *payload, int size) int multi, const void *payload, int size)
{ {
struct sk_buff *skb; struct sk_buff *skb;
@ -829,7 +875,7 @@ struct sk_buff *audit_make_reply(__u32 portid, int seq, int type, int done,
if (!skb) if (!skb)
return NULL; return NULL;
nlh = nlmsg_put(skb, portid, seq, t, size, flags); nlh = nlmsg_put(skb, 0, seq, t, size, flags);
if (!nlh) if (!nlh)
goto out_kfree_skb; goto out_kfree_skb;
data = nlmsg_data(nlh); data = nlmsg_data(nlh);
@ -873,7 +919,6 @@ static int audit_send_reply_thread(void *arg)
static void audit_send_reply(struct sk_buff *request_skb, int seq, int type, int done, static void audit_send_reply(struct sk_buff *request_skb, int seq, int type, int done,
int multi, const void *payload, int size) int multi, const void *payload, int size)
{ {
u32 portid = NETLINK_CB(request_skb).portid;
struct net *net = sock_net(NETLINK_CB(request_skb).sk); struct net *net = sock_net(NETLINK_CB(request_skb).sk);
struct sk_buff *skb; struct sk_buff *skb;
struct task_struct *tsk; struct task_struct *tsk;
@ -883,12 +928,12 @@ static void audit_send_reply(struct sk_buff *request_skb, int seq, int type, int
if (!reply) if (!reply)
return; return;
skb = audit_make_reply(portid, seq, type, done, multi, payload, size); skb = audit_make_reply(seq, type, done, multi, payload, size);
if (!skb) if (!skb)
goto out; goto out;
reply->net = get_net(net); reply->net = get_net(net);
reply->portid = portid; reply->portid = NETLINK_CB(request_skb).portid;
reply->skb = skb; reply->skb = skb;
tsk = kthread_run(audit_send_reply_thread, reply, "audit_send_reply"); tsk = kthread_run(audit_send_reply_thread, reply, "audit_send_reply");
@ -1068,11 +1113,13 @@ static int audit_set_feature(struct sk_buff *skb)
return 0; return 0;
} }
static int audit_replace(pid_t pid) static int audit_replace(struct pid *pid)
{ {
pid_t pvnr;
struct sk_buff *skb; struct sk_buff *skb;
skb = audit_make_reply(0, 0, AUDIT_REPLACE, 0, 0, &pid, sizeof(pid)); pvnr = pid_vnr(pid);
skb = audit_make_reply(0, AUDIT_REPLACE, 0, 0, &pvnr, sizeof(pvnr));
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
return auditd_send_unicast_skb(skb); return auditd_send_unicast_skb(skb);
@ -1102,9 +1149,9 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
s.enabled = audit_enabled; s.enabled = audit_enabled;
s.failure = audit_failure; s.failure = audit_failure;
rcu_read_lock(); /* NOTE: use pid_vnr() so the PID is relative to the current
s.pid = auditd_conn.pid; * namespace */
rcu_read_unlock(); s.pid = auditd_pid_vnr();
s.rate_limit = audit_rate_limit; s.rate_limit = audit_rate_limit;
s.backlog_limit = audit_backlog_limit; s.backlog_limit = audit_backlog_limit;
s.lost = atomic_read(&audit_lost); s.lost = atomic_read(&audit_lost);
@ -1130,51 +1177,61 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
return err; return err;
} }
if (s.mask & AUDIT_STATUS_PID) { if (s.mask & AUDIT_STATUS_PID) {
/* NOTE: we are using task_tgid_vnr() below because /* NOTE: we are using the vnr PID functions below
* the s.pid value is relative to the namespace * because the s.pid value is relative to the
* of the caller; at present this doesn't matter * namespace of the caller; at present this
* much since you can really only run auditd * doesn't matter much since you can really only
* from the initial pid namespace, but something * run auditd from the initial pid namespace, but
* to keep in mind if this changes */ * something to keep in mind if this changes */
int new_pid = s.pid; pid_t new_pid = s.pid;
pid_t auditd_pid; pid_t auditd_pid;
pid_t requesting_pid = task_tgid_vnr(current); struct pid *req_pid = task_tgid(current);
/* sanity check - PID values must match */
if (new_pid != pid_vnr(req_pid))
return -EINVAL;
/* test the auditd connection */ /* test the auditd connection */
audit_replace(requesting_pid); audit_replace(req_pid);
rcu_read_lock(); auditd_pid = auditd_pid_vnr();
auditd_pid = auditd_conn.pid;
/* only the current auditd can unregister itself */ /* only the current auditd can unregister itself */
if ((!new_pid) && (requesting_pid != auditd_pid)) { if ((!new_pid) && (new_pid != auditd_pid)) {
rcu_read_unlock();
audit_log_config_change("audit_pid", new_pid, audit_log_config_change("audit_pid", new_pid,
auditd_pid, 0); auditd_pid, 0);
return -EACCES; return -EACCES;
} }
/* replacing a healthy auditd is not allowed */ /* replacing a healthy auditd is not allowed */
if (auditd_pid && new_pid) { if (auditd_pid && new_pid) {
rcu_read_unlock();
audit_log_config_change("audit_pid", new_pid, audit_log_config_change("audit_pid", new_pid,
auditd_pid, 0); auditd_pid, 0);
return -EEXIST; return -EEXIST;
} }
rcu_read_unlock();
if (audit_enabled != AUDIT_OFF)
audit_log_config_change("audit_pid", new_pid,
auditd_pid, 1);
if (new_pid) { if (new_pid) {
/* register a new auditd connection */ /* register a new auditd connection */
auditd_set(new_pid, err = auditd_set(req_pid,
NETLINK_CB(skb).portid, NETLINK_CB(skb).portid,
sock_net(NETLINK_CB(skb).sk)); sock_net(NETLINK_CB(skb).sk));
if (audit_enabled != AUDIT_OFF)
audit_log_config_change("audit_pid",
new_pid,
auditd_pid,
err ? 0 : 1);
if (err)
return err;
/* try to process any backlog */ /* try to process any backlog */
wake_up_interruptible(&kauditd_wait); wake_up_interruptible(&kauditd_wait);
} else } else {
if (audit_enabled != AUDIT_OFF)
audit_log_config_change("audit_pid",
new_pid,
auditd_pid, 1);
/* unregister the auditd connection */ /* unregister the auditd connection */
auditd_reset(); auditd_reset();
}
} }
if (s.mask & AUDIT_STATUS_RATE_LIMIT) { if (s.mask & AUDIT_STATUS_RATE_LIMIT) {
err = audit_set_rate_limit(s.rate_limit); err = audit_set_rate_limit(s.rate_limit);
@ -1242,7 +1299,6 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
size--; size--;
audit_log_n_untrustedstring(ab, data, size); audit_log_n_untrustedstring(ab, data, size);
} }
audit_set_portid(ab, NETLINK_CB(skb).portid);
audit_log_end(ab); audit_log_end(ab);
} }
break; break;
@ -1256,8 +1312,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
audit_log_end(ab); audit_log_end(ab);
return -EPERM; return -EPERM;
} }
err = audit_rule_change(msg_type, NETLINK_CB(skb).portid, err = audit_rule_change(msg_type, seq, data, nlmsg_len(nlh));
seq, data, nlmsg_len(nlh));
break; break;
case AUDIT_LIST_RULES: case AUDIT_LIST_RULES:
err = audit_list_rules_send(skb, seq); err = audit_list_rules_send(skb, seq);
@ -1378,11 +1433,14 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
return err < 0 ? err : 0; return err < 0 ? err : 0;
} }
/* /**
* Get message from skb. Each message is processed by audit_receive_msg. * audit_receive - receive messages from a netlink control socket
* Malformed skbs with wrong length are discarded silently. * @skb: the message buffer
*
* Parse the provided skb and deal with any messages that may be present,
* malformed skbs are discarded.
*/ */
static void audit_receive_skb(struct sk_buff *skb) static void audit_receive(struct sk_buff *skb)
{ {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
/* /*
@ -1395,6 +1453,7 @@ static void audit_receive_skb(struct sk_buff *skb)
nlh = nlmsg_hdr(skb); nlh = nlmsg_hdr(skb);
len = skb->len; len = skb->len;
mutex_lock(&audit_cmd_mutex);
while (nlmsg_ok(nlh, len)) { while (nlmsg_ok(nlh, len)) {
err = audit_receive_msg(skb, nlh); err = audit_receive_msg(skb, nlh);
/* if err or if this message says it wants a response */ /* if err or if this message says it wants a response */
@ -1403,13 +1462,6 @@ static void audit_receive_skb(struct sk_buff *skb)
nlh = nlmsg_next(nlh, &len); nlh = nlmsg_next(nlh, &len);
} }
}
/* Receive messages from netlink socket. */
static void audit_receive(struct sk_buff *skb)
{
mutex_lock(&audit_cmd_mutex);
audit_receive_skb(skb);
mutex_unlock(&audit_cmd_mutex); mutex_unlock(&audit_cmd_mutex);
} }
@ -1447,10 +1499,11 @@ static void __net_exit audit_net_exit(struct net *net)
{ {
struct audit_net *aunet = net_generic(net, audit_net_id); struct audit_net *aunet = net_generic(net, audit_net_id);
rcu_read_lock(); /* NOTE: you would think that we would want to check the auditd
if (net == auditd_conn.net) * connection and potentially reset it here if it lives in this
auditd_reset(); * namespace, but since the auditd connection tracking struct holds a
rcu_read_unlock(); * reference to this namespace (see auditd_set()) we are only ever
* going to get here after that connection has been released */
netlink_kernel_release(aunet->sk); netlink_kernel_release(aunet->sk);
} }
@ -1470,8 +1523,9 @@ static int __init audit_init(void)
if (audit_initialized == AUDIT_DISABLED) if (audit_initialized == AUDIT_DISABLED)
return 0; return 0;
memset(&auditd_conn, 0, sizeof(auditd_conn)); audit_buffer_cache = kmem_cache_create("audit_buffer",
spin_lock_init(&auditd_conn.lock); sizeof(struct audit_buffer),
0, SLAB_PANIC, NULL);
skb_queue_head_init(&audit_queue); skb_queue_head_init(&audit_queue);
skb_queue_head_init(&audit_retry_queue); skb_queue_head_init(&audit_retry_queue);
@ -1538,60 +1592,33 @@ __setup("audit_backlog_limit=", audit_backlog_limit_set);
static void audit_buffer_free(struct audit_buffer *ab) static void audit_buffer_free(struct audit_buffer *ab)
{ {
unsigned long flags;
if (!ab) if (!ab)
return; return;
kfree_skb(ab->skb); kfree_skb(ab->skb);
spin_lock_irqsave(&audit_freelist_lock, flags); kmem_cache_free(audit_buffer_cache, ab);
if (audit_freelist_count > AUDIT_MAXFREE)
kfree(ab);
else {
audit_freelist_count++;
list_add(&ab->list, &audit_freelist);
}
spin_unlock_irqrestore(&audit_freelist_lock, flags);
} }
static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx, static struct audit_buffer *audit_buffer_alloc(struct audit_context *ctx,
gfp_t gfp_mask, int type) gfp_t gfp_mask, int type)
{ {
unsigned long flags; struct audit_buffer *ab;
struct audit_buffer *ab = NULL;
struct nlmsghdr *nlh;
spin_lock_irqsave(&audit_freelist_lock, flags); ab = kmem_cache_alloc(audit_buffer_cache, gfp_mask);
if (!list_empty(&audit_freelist)) { if (!ab)
ab = list_entry(audit_freelist.next, return NULL;
struct audit_buffer, list);
list_del(&ab->list);
--audit_freelist_count;
}
spin_unlock_irqrestore(&audit_freelist_lock, flags);
if (!ab) {
ab = kmalloc(sizeof(*ab), gfp_mask);
if (!ab)
goto err;
}
ab->ctx = ctx;
ab->gfp_mask = gfp_mask;
ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask); ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask);
if (!ab->skb) if (!ab->skb)
goto err; goto err;
if (!nlmsg_put(ab->skb, 0, 0, type, 0, 0))
goto err;
nlh = nlmsg_put(ab->skb, 0, 0, type, 0, 0); ab->ctx = ctx;
if (!nlh) ab->gfp_mask = gfp_mask;
goto out_kfree_skb;
return ab; return ab;
out_kfree_skb:
kfree_skb(ab->skb);
ab->skb = NULL;
err: err:
audit_buffer_free(ab); audit_buffer_free(ab);
return NULL; return NULL;
@ -1622,10 +1649,10 @@ unsigned int audit_serial(void)
} }
static inline void audit_get_stamp(struct audit_context *ctx, static inline void audit_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial) struct timespec64 *t, unsigned int *serial)
{ {
if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
*t = CURRENT_TIME; ktime_get_real_ts64(t);
*serial = audit_serial(); *serial = audit_serial();
} }
} }
@ -1649,7 +1676,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
int type) int type)
{ {
struct audit_buffer *ab; struct audit_buffer *ab;
struct timespec t; struct timespec64 t;
unsigned int uninitialized_var(serial); unsigned int uninitialized_var(serial);
if (audit_initialized != AUDIT_INITIALIZED) if (audit_initialized != AUDIT_INITIALIZED)
@ -1702,8 +1729,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
} }
audit_get_stamp(ab->ctx, &t, &serial); audit_get_stamp(ab->ctx, &t, &serial);
audit_log_format(ab, "audit(%lu.%03lu:%u): ", audit_log_format(ab, "audit(%llu.%03lu:%u): ",
t.tv_sec, t.tv_nsec/1000000, serial); (unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial);
return ab; return ab;
} }

7
kernel/audit.h
View File

@ -112,7 +112,7 @@ struct audit_context {
enum audit_state state, current_state; enum audit_state state, current_state;
unsigned int serial; /* serial number for record */ unsigned int serial; /* serial number for record */
int major; /* syscall number */ int major; /* syscall number */
struct timespec ctime; /* time of syscall entry */ struct timespec64 ctime; /* time of syscall entry */
unsigned long argv[4]; /* syscall arguments */ unsigned long argv[4]; /* syscall arguments */
long return_code;/* syscall return code */ long return_code;/* syscall return code */
u64 prio; u64 prio;
@ -218,7 +218,7 @@ extern void audit_log_name(struct audit_context *context,
struct audit_names *n, const struct path *path, struct audit_names *n, const struct path *path,
int record_num, int *call_panic); int record_num, int *call_panic);
extern int auditd_test_task(const struct task_struct *task); extern int auditd_test_task(struct task_struct *task);
#define AUDIT_INODE_BUCKETS 32 #define AUDIT_INODE_BUCKETS 32
extern struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS]; extern struct list_head audit_inode_hash[AUDIT_INODE_BUCKETS];
@ -237,8 +237,7 @@ extern int audit_uid_comparator(kuid_t left, u32 op, kuid_t right);
extern int audit_gid_comparator(kgid_t left, u32 op, kgid_t right); extern int audit_gid_comparator(kgid_t left, u32 op, kgid_t right);
extern int parent_len(const char *path); extern int parent_len(const char *path);
extern int audit_compare_dname_path(const char *dname, const char *path, int plen); extern int audit_compare_dname_path(const char *dname, const char *path, int plen);
extern struct sk_buff *audit_make_reply(__u32 portid, int seq, int type, extern struct sk_buff *audit_make_reply(int seq, int type, int done, int multi,
int done, int multi,
const void *payload, int size); const void *payload, int size);
extern void audit_panic(const char *message); extern void audit_panic(const char *message);

2
kernel/audit_fsnotify.c
View File

@ -187,7 +187,7 @@ static int audit_mark_handle_event(struct fsnotify_group *group,
default: default:
BUG(); BUG();
return 0; return 0;
}; }
if (mask & (FS_CREATE|FS_MOVED_TO|FS_DELETE|FS_MOVED_FROM)) { if (mask & (FS_CREATE|FS_MOVED_TO|FS_DELETE|FS_MOVED_FROM)) {
if (audit_compare_dname_path(dname, audit_mark->path, AUDIT_NAME_FULL)) if (audit_compare_dname_path(dname, audit_mark->path, AUDIT_NAME_FULL))

9
kernel/audit_tree.c
View File

@ -3,13 +3,14 @@
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/refcount.h>
#include <linux/slab.h> #include <linux/slab.h>
struct audit_tree; struct audit_tree;
struct audit_chunk; struct audit_chunk;
struct audit_tree { struct audit_tree {
atomic_t count; refcount_t count;
int goner; int goner;
struct audit_chunk *root; struct audit_chunk *root;
struct list_head chunks; struct list_head chunks;
@ -77,7 +78,7 @@ static struct audit_tree *alloc_tree(const char *s)
tree = kmalloc(sizeof(struct audit_tree) + strlen(s) + 1, GFP_KERNEL); tree = kmalloc(sizeof(struct audit_tree) + strlen(s) + 1, GFP_KERNEL);
if (tree) { if (tree) {
atomic_set(&tree->count, 1); refcount_set(&tree->count, 1);
tree->goner = 0; tree->goner = 0;
INIT_LIST_HEAD(&tree->chunks); INIT_LIST_HEAD(&tree->chunks);
INIT_LIST_HEAD(&tree->rules); INIT_LIST_HEAD(&tree->rules);
@ -91,12 +92,12 @@ static struct audit_tree *alloc_tree(const char *s)
static inline void get_tree(struct audit_tree *tree) static inline void get_tree(struct audit_tree *tree)
{ {
atomic_inc(&tree->count); refcount_inc(&tree->count);
} }
static inline void put_tree(struct audit_tree *tree) static inline void put_tree(struct audit_tree *tree)
{ {
if (atomic_dec_and_test(&tree->count)) if (refcount_dec_and_test(&tree->count))
kfree_rcu(tree, head); kfree_rcu(tree, head);
} }

11
kernel/audit_watch.c
View File

@ -28,6 +28,7 @@
#include <linux/fsnotify_backend.h> #include <linux/fsnotify_backend.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/refcount.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/security.h> #include <linux/security.h>
@ -46,7 +47,7 @@
*/ */
struct audit_watch { struct audit_watch {
atomic_t count; /* reference count */ refcount_t count; /* reference count */
dev_t dev; /* associated superblock device */ dev_t dev; /* associated superblock device */
char *path; /* insertion path */ char *path; /* insertion path */
unsigned long ino; /* associated inode number */ unsigned long ino; /* associated inode number */
@ -111,12 +112,12 @@ static inline struct audit_parent *audit_find_parent(struct inode *inode)
void audit_get_watch(struct audit_watch *watch) void audit_get_watch(struct audit_watch *watch)
{ {
atomic_inc(&watch->count); refcount_inc(&watch->count);
} }
void audit_put_watch(struct audit_watch *watch) void audit_put_watch(struct audit_watch *watch)
{ {
if (atomic_dec_and_test(&watch->count)) { if (refcount_dec_and_test(&watch->count)) {
WARN_ON(watch->parent); WARN_ON(watch->parent);
WARN_ON(!list_empty(&watch->rules)); WARN_ON(!list_empty(&watch->rules));
kfree(watch->path); kfree(watch->path);
@ -178,7 +179,7 @@ static struct audit_watch *audit_init_watch(char *path)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&watch->rules); INIT_LIST_HEAD(&watch->rules);
atomic_set(&watch->count, 1); refcount_set(&watch->count, 1);
watch->path = path; watch->path = path;
watch->dev = AUDIT_DEV_UNSET; watch->dev = AUDIT_DEV_UNSET;
watch->ino = AUDIT_INO_UNSET; watch->ino = AUDIT_INO_UNSET;
@ -492,7 +493,7 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
BUG(); BUG();
inode = NULL; inode = NULL;
break; break;
}; }
if (mask & (FS_CREATE|FS_MOVED_TO) && inode) if (mask & (FS_CREATE|FS_MOVED_TO) && inode)
audit_update_watch(parent, dname, inode->i_sb->s_dev, inode->i_ino, 0); audit_update_watch(parent, dname, inode->i_sb->s_dev, inode->i_ino, 0);

18
kernel/auditfilter.c
View File

@ -338,7 +338,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f)
entry->rule.listnr != AUDIT_FILTER_USER) entry->rule.listnr != AUDIT_FILTER_USER)
return -EINVAL; return -EINVAL;
break; break;
}; }
switch(f->type) { switch(f->type) {
default: default:
@ -412,7 +412,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f)
if (entry->rule.listnr != AUDIT_FILTER_EXIT) if (entry->rule.listnr != AUDIT_FILTER_EXIT)
return -EINVAL; return -EINVAL;
break; break;
}; }
return 0; return 0;
} }
@ -1033,7 +1033,7 @@ out:
} }
/* List rules using struct audit_rule_data. */ /* List rules using struct audit_rule_data. */
static void audit_list_rules(__u32 portid, int seq, struct sk_buff_head *q) static void audit_list_rules(int seq, struct sk_buff_head *q)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct audit_krule *r; struct audit_krule *r;
@ -1048,15 +1048,15 @@ static void audit_list_rules(__u32 portid, int seq, struct sk_buff_head *q)
data = audit_krule_to_data(r); data = audit_krule_to_data(r);
if (unlikely(!data)) if (unlikely(!data))
break; break;
skb = audit_make_reply(portid, seq, AUDIT_LIST_RULES, skb = audit_make_reply(seq, AUDIT_LIST_RULES, 0, 1,
0, 1, data, data,
sizeof(*data) + data->buflen); sizeof(*data) + data->buflen);
if (skb) if (skb)
skb_queue_tail(q, skb); skb_queue_tail(q, skb);
kfree(data); kfree(data);
} }
} }
skb = audit_make_reply(portid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0); skb = audit_make_reply(seq, AUDIT_LIST_RULES, 1, 1, NULL, 0);
if (skb) if (skb)
skb_queue_tail(q, skb); skb_queue_tail(q, skb);
} }
@ -1085,13 +1085,11 @@ static void audit_log_rule_change(char *action, struct audit_krule *rule, int re
/** /**
* audit_rule_change - apply all rules to the specified message type * audit_rule_change - apply all rules to the specified message type
* @type: audit message type * @type: audit message type
* @portid: target port id for netlink audit messages
* @seq: netlink audit message sequence (serial) number * @seq: netlink audit message sequence (serial) number
* @data: payload data * @data: payload data
* @datasz: size of payload data * @datasz: size of payload data
*/ */
int audit_rule_change(int type, __u32 portid, int seq, void *data, int audit_rule_change(int type, int seq, void *data, size_t datasz)
size_t datasz)
{ {
int err = 0; int err = 0;
struct audit_entry *entry; struct audit_entry *entry;
@ -1150,7 +1148,7 @@ int audit_list_rules_send(struct sk_buff *request_skb, int seq)
skb_queue_head_init(&dest->q); skb_queue_head_init(&dest->q);
mutex_lock(&audit_filter_mutex); mutex_lock(&audit_filter_mutex);
audit_list_rules(portid, seq, &dest->q); audit_list_rules(seq, &dest->q);
mutex_unlock(&audit_filter_mutex); mutex_unlock(&audit_filter_mutex);
tsk = kthread_run(audit_send_list, dest, "audit_send_list"); tsk = kthread_run(audit_send_list, dest, "audit_send_list");

6
kernel/auditsc.c
View File

@ -1532,7 +1532,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
return; return;
context->serial = 0; context->serial = 0;
context->ctime = CURRENT_TIME; ktime_get_real_ts64(&context->ctime);
context->in_syscall = 1; context->in_syscall = 1;
context->current_state = state; context->current_state = state;
context->ppid = 0; context->ppid = 0;
@ -1941,13 +1941,13 @@ EXPORT_SYMBOL_GPL(__audit_inode_child);
/** /**
* auditsc_get_stamp - get local copies of audit_context values * auditsc_get_stamp - get local copies of audit_context values
* @ctx: audit_context for the task * @ctx: audit_context for the task
* @t: timespec to store time recorded in the audit_context * @t: timespec64 to store time recorded in the audit_context
* @serial: serial value that is recorded in the audit_context * @serial: serial value that is recorded in the audit_context
* *
* Also sets the context as auditable. * Also sets the context as auditable.
*/ */
int auditsc_get_stamp(struct audit_context *ctx, int auditsc_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial) struct timespec64 *t, unsigned int *serial)
{ {
if (!ctx->in_syscall) if (!ctx->in_syscall)
return 0; return 0;

2
kernel/module.c
View File

@ -963,6 +963,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
return -EFAULT; return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0'; name[MODULE_NAME_LEN-1] = '\0';
audit_log_kern_module(name);
if (mutex_lock_interruptible(&module_mutex) != 0) if (mutex_lock_interruptible(&module_mutex) != 0)
return -EINTR; return -EINTR;

128
net/netfilter/xt_AUDIT.c
View File

@ -31,146 +31,76 @@ MODULE_ALIAS("ip6t_AUDIT");
MODULE_ALIAS("ebt_AUDIT"); MODULE_ALIAS("ebt_AUDIT");
MODULE_ALIAS("arpt_AUDIT"); MODULE_ALIAS("arpt_AUDIT");
static void audit_proto(struct audit_buffer *ab, struct sk_buff *skb, static bool audit_ip4(struct audit_buffer *ab, struct sk_buff *skb)
unsigned int proto, unsigned int offset)
{
switch (proto) {
case IPPROTO_TCP:
case IPPROTO_UDP:
case IPPROTO_UDPLITE: {
const __be16 *pptr;
__be16 _ports[2];
pptr = skb_header_pointer(skb, offset, sizeof(_ports), _ports);
if (pptr == NULL) {
audit_log_format(ab, " truncated=1");
return;
}
audit_log_format(ab, " sport=%hu dport=%hu",
ntohs(pptr[0]), ntohs(pptr[1]));
}
break;
case IPPROTO_ICMP:
case IPPROTO_ICMPV6: {
const u8 *iptr;
u8 _ih[2];
iptr = skb_header_pointer(skb, offset, sizeof(_ih), &_ih);
if (iptr == NULL) {
audit_log_format(ab, " truncated=1");
return;
}
audit_log_format(ab, " icmptype=%hhu icmpcode=%hhu",
iptr[0], iptr[1]);
}
break;
}
}
static void audit_ip4(struct audit_buffer *ab, struct sk_buff *skb)
{ {
struct iphdr _iph; struct iphdr _iph;
const struct iphdr *ih; const struct iphdr *ih;
ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph); ih = skb_header_pointer(skb, skb_network_offset(skb), sizeof(_iph), &_iph);
if (!ih) { if (!ih)
audit_log_format(ab, " truncated=1"); return false;
return;
}
audit_log_format(ab, " saddr=%pI4 daddr=%pI4 ipid=%hu proto=%hhu", audit_log_format(ab, " saddr=%pI4 daddr=%pI4 proto=%hhu",
&ih->saddr, &ih->daddr, ntohs(ih->id), ih->protocol); &ih->saddr, &ih->daddr, ih->protocol);
if (ntohs(ih->frag_off) & IP_OFFSET) { return true;
audit_log_format(ab, " frag=1");
return;
}
audit_proto(ab, skb, ih->protocol, ih->ihl * 4);
} }
static void audit_ip6(struct audit_buffer *ab, struct sk_buff *skb) static bool audit_ip6(struct audit_buffer *ab, struct sk_buff *skb)
{ {
struct ipv6hdr _ip6h; struct ipv6hdr _ip6h;
const struct ipv6hdr *ih; const struct ipv6hdr *ih;
u8 nexthdr; u8 nexthdr;
__be16 frag_off; __be16 frag_off;
int offset;
ih = skb_header_pointer(skb, skb_network_offset(skb), sizeof(_ip6h), &_ip6h); ih = skb_header_pointer(skb, skb_network_offset(skb), sizeof(_ip6h), &_ip6h);
if (!ih) { if (!ih)
audit_log_format(ab, " truncated=1"); return false;
return;
}
nexthdr = ih->nexthdr; nexthdr = ih->nexthdr;
offset = ipv6_skip_exthdr(skb, skb_network_offset(skb) + sizeof(_ip6h), ipv6_skip_exthdr(skb, skb_network_offset(skb) + sizeof(_ip6h), &nexthdr, &frag_off);
&nexthdr, &frag_off);
audit_log_format(ab, " saddr=%pI6c daddr=%pI6c proto=%hhu", audit_log_format(ab, " saddr=%pI6c daddr=%pI6c proto=%hhu",
&ih->saddr, &ih->daddr, nexthdr); &ih->saddr, &ih->daddr, nexthdr);
if (offset) return true;
audit_proto(ab, skb, nexthdr, offset);
} }
static unsigned int static unsigned int
audit_tg(struct sk_buff *skb, const struct xt_action_param *par) audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_audit_info *info = par->targinfo;
struct audit_buffer *ab; struct audit_buffer *ab;
int fam = -1;
if (audit_enabled == 0) if (audit_enabled == 0)
goto errout; goto errout;
ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT); ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);
if (ab == NULL) if (ab == NULL)
goto errout; goto errout;
audit_log_format(ab, "action=%hhu hook=%u len=%u inif=%s outif=%s", audit_log_format(ab, "mark=%#x", skb->mark);
info->type, xt_hooknum(par), skb->len,
xt_in(par) ? xt_inname(par) : "?",
xt_out(par) ? xt_outname(par) : "?");
if (skb->mark)
audit_log_format(ab, " mark=%#x", skb->mark);
if (skb->dev && skb->dev->type == ARPHRD_ETHER) {
audit_log_format(ab, " smac=%pM dmac=%pM macproto=0x%04x",
eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,
ntohs(eth_hdr(skb)->h_proto));
if (xt_family(par) == NFPROTO_BRIDGE) {
switch (eth_hdr(skb)->h_proto) {
case htons(ETH_P_IP):
audit_ip4(ab, skb);
break;
case htons(ETH_P_IPV6):
audit_ip6(ab, skb);
break;
}
}
}
switch (xt_family(par)) { switch (xt_family(par)) {
case NFPROTO_IPV4: case NFPROTO_BRIDGE:
audit_ip4(ab, skb); switch (eth_hdr(skb)->h_proto) {
case htons(ETH_P_IP):
fam = audit_ip4(ab, skb) ? NFPROTO_IPV4 : -1;
break;
case htons(ETH_P_IPV6):
fam = audit_ip6(ab, skb) ? NFPROTO_IPV6 : -1;
break;
}
break;
case NFPROTO_IPV4:
fam = audit_ip4(ab, skb) ? NFPROTO_IPV4 : -1;
break; break;
case NFPROTO_IPV6: case NFPROTO_IPV6:
audit_ip6(ab, skb); fam = audit_ip6(ab, skb) ? NFPROTO_IPV6 : -1;
break; break;
} }
#ifdef CONFIG_NETWORK_SECMARK if (fam == -1)
if (skb->secmark) audit_log_format(ab, " saddr=? daddr=? proto=-1");
audit_log_secctx(ab, skb->secmark);
#endif
audit_log_end(ab); audit_log_end(ab);