History

Merge git://git.infradead.org/users/eparis/audit

Pull audit updates from Eric Paris. * git://git.infradead.org/users/eparis/audit: (28 commits) AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range audit: do not cast audit_rule_data pointers pointlesly AUDIT: Allow login in non-init namespaces audit: define audit_is_compat in kernel internal header kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c sched: declare pid_alive as inline audit: use uapi/linux/audit.h for AUDIT_ARCH declarations syscall_get_arch: remove useless function arguments audit: remove stray newline from audit_log_execve_info() audit_panic() call audit: remove stray newlines from audit_log_lost messages audit: include subject in login records audit: remove superfluous new- prefix in AUDIT_LOGIN messages audit: allow user processes to log from another PID namespace audit: anchor all pid references in the initial pid namespace audit: convert PPIDs to the inital PID namespace. pid: get pid_t ppid of task in init_pid_ns audit: rename the misleading audit_get_context() to audit_take_context() audit: Add generic compat syscall support audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL ...

Linus Torvalds committed 12 years ago

Commit 0b747172 parents b7e70ca 312103d36 files · +351 −119Browse files

Showing the changes to include (6 of 36 files). Show all

Unified · Split

6 files
  1. include/asm-generic/syscall.h +1 −3
  2. include/linux/audit.h +14 −0
  3. include/linux/mm.h +1 −0
  4. include/linux/sched.h +19 −1
  5. include/uapi/linux/audit.h +2 −1
  6. include/uapi/linux/capability.h +4 −0
include/asm-generic/syscall.h+1−3
@@ -144,8 +144,6 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, · 143 unmodified lines
144144
145145 /**
146146 * syscall_get_arch - return the AUDIT_ARCH for the current system call
147− * @task: task of interest, must be in system call entry tracing
148− * @regs: task_pt_regs() of @task
149147 *
150148 * Returns the AUDIT_ARCH_* based on the system call convention in use.
151149 *
@@ -155,5 +153,5 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, · 3 unmodified lines
155153 * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must
156154 * provide an implementation of this.
157155 */
158−int syscall_get_arch(struct task_struct *task, struct pt_regs *regs);
156+int syscall_get_arch(void);
159157 #endif /* _ASM_SYSCALL_H */
include/linux/audit.h+14−0
@@ -79,6 +79,14 @@ extern int is_audit_feature_set(int which); · 78 unmodified lines
7979 extern int __init audit_register_class(int class, unsigned *list);
8080 extern int audit_classify_syscall(int abi, unsigned syscall);
8181 extern int audit_classify_arch(int arch);
82+/* only for compat system calls */
83+extern unsigned compat_write_class[];
84+extern unsigned compat_read_class[];
85+extern unsigned compat_dir_class[];
86+extern unsigned compat_chattr_class[];
87+extern unsigned compat_signal_class[];
88+
89+extern int __weak audit_classify_compat_syscall(int abi, unsigned syscall);
8290
8391 /* audit_names->type values */
8492 #define AUDIT_TYPE_UNKNOWN 0 /* we don't know yet */
@@ -94,6 +102,12 @@ struct filename; · 9 unmodified lines
94102
95103 extern void audit_log_session_info(struct audit_buffer *ab);
96104
105+#ifdef CONFIG_AUDIT_COMPAT_GENERIC
106+#define audit_is_compat(arch) (!((arch) & __AUDIT_ARCH_64BIT))
107+#else
108+#define audit_is_compat(arch) false
109+#endif
110+
97111 #ifdef CONFIG_AUDITSYSCALL
98112 /* These are defined in auditsc.c */
99113 /* Public API */
include/linux/mm.h+1−0
@@ -1204,6 +1204,7 @@ void account_page_writeback(struct page *page); · 1203 unmodified lines
12041204 int set_page_dirty(struct page *page);
12051205 int set_page_dirty_lock(struct page *page);
12061206 int clear_page_dirty_for_io(struct page *page);
1207+int get_cmdline(struct task_struct *task, char *buffer, int buflen);
12071208
12081209 /* Is the vma a continuation of the stack vma above it? */
12091210 static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
include/linux/sched.h+19−1
@@ -1719,6 +1719,24 @@ static inline pid_t task_tgid_vnr(struct task_struct *tsk) · 1718 unmodified lines
17191719 }
17201720
17211721
1722+static inline int pid_alive(const struct task_struct *p);
1723+static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns)
1724+{
1725+ pid_t pid = 0;
1726+
1727+ rcu_read_lock();
1728+ if (pid_alive(tsk))
1729+ pid = task_tgid_nr_ns(rcu_dereference(tsk->real_parent), ns);
1730+ rcu_read_unlock();
1731+
1732+ return pid;
1733+}
1734+
1735+static inline pid_t task_ppid_nr(const struct task_struct *tsk)
1736+{
1737+ return task_ppid_nr_ns(tsk, &init_pid_ns);
1738+}
1739+
17221740 static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk,
17231741 struct pid_namespace *ns)
17241742 {
@@ -1758,7 +1776,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk) · 33 unmodified lines
17581776 *
17591777 * Return: 1 if the process is alive. 0 otherwise.
17601778 */
1761−static inline int pid_alive(struct task_struct *p)
1779+static inline int pid_alive(const struct task_struct *p)
17621780 {
17631781 return p->pids[PIDTYPE_PID].pid != NULL;
17641782 }
include/uapi/linux/audit.h+2−1
@@ -70,7 +70,6 @@ · 69 unmodified lines
7070 #define AUDIT_TTY_SET 1017 /* Set TTY auditing status */
7171 #define AUDIT_SET_FEATURE 1018 /* Turn an audit feature on or off */
7272 #define AUDIT_GET_FEATURE 1019 /* Get which features are enabled */
73−#define AUDIT_FEATURE_CHANGE 1020 /* audit log listing feature changes */
7473
7574 #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */
7675 #define AUDIT_USER_AVC 1107 /* We filter this differently */
@@ -109,6 +108,8 @@ · 32 unmodified lines
109108 #define AUDIT_NETFILTER_PKT 1324 /* Packets traversing netfilter chains */
110109 #define AUDIT_NETFILTER_CFG 1325 /* Netfilter chain modifications */
111110 #define AUDIT_SECCOMP 1326 /* Secure Computing event */
111+#define AUDIT_PROCTITLE 1327 /* Proctitle emit event */
112+#define AUDIT_FEATURE_CHANGE 1328 /* audit log listing feature changes */
112113
113114 #define AUDIT_AVC 1400 /* SE Linux avc denial or grant */
114115 #define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */
include/uapi/linux/capability.h+4−0
@@ -308,8 +308,12 @@ struct vfs_cap_data { · 307 unmodified lines
308308
309309 #define CAP_LEASE 28
310310
311+/* Allow writing the audit log via unicast netlink socket */
312+
311313 #define CAP_AUDIT_WRITE 29
312314
315+/* Allow configuration of audit via unicast netlink socket */
316+
313317 #define CAP_AUDIT_CONTROL 30
314318
315319 #define CAP_SETFCAP 31

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t