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 ...
Showing the changes to include (6 of 36 files). Show all
Unified · Split
| @@ -144,8 +144,6 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, · 143 unmodified lines | ||
| 144 | 144 | |
| 145 | 145 | /** |
| 146 | 146 | * 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 | |
| 149 | 147 | * |
| 150 | 148 | * Returns the AUDIT_ARCH_* based on the system call convention in use. |
| 151 | 149 | * |
| @@ -155,5 +153,5 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, · 3 unmodified lines | ||
| 155 | 153 | * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must |
| 156 | 154 | * provide an implementation of this. |
| 157 | 155 | */ |
| 158 | −int syscall_get_arch(struct task_struct *task, struct pt_regs *regs); | |
| 156 | +int syscall_get_arch(void); | |
| 159 | 157 | #endif /* _ASM_SYSCALL_H */ |
| @@ -79,6 +79,14 @@ extern int is_audit_feature_set(int which); · 78 unmodified lines | ||
| 79 | 79 | extern int __init audit_register_class(int class, unsigned *list); |
| 80 | 80 | extern int audit_classify_syscall(int abi, unsigned syscall); |
| 81 | 81 | 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); | |
| 82 | 90 | |
| 83 | 91 | /* audit_names->type values */ |
| 84 | 92 | #define AUDIT_TYPE_UNKNOWN 0 /* we don't know yet */ |
| @@ -94,6 +102,12 @@ struct filename; · 9 unmodified lines | ||
| 94 | 102 | |
| 95 | 103 | extern void audit_log_session_info(struct audit_buffer *ab); |
| 96 | 104 | |
| 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 | + | |
| 97 | 111 | #ifdef CONFIG_AUDITSYSCALL |
| 98 | 112 | /* These are defined in auditsc.c */ |
| 99 | 113 | /* Public API */ |
| @@ -1204,6 +1204,7 @@ void account_page_writeback(struct page *page); · 1203 unmodified lines | ||
| 1204 | 1204 | int set_page_dirty(struct page *page); |
| 1205 | 1205 | int set_page_dirty_lock(struct page *page); |
| 1206 | 1206 | int clear_page_dirty_for_io(struct page *page); |
| 1207 | +int get_cmdline(struct task_struct *task, char *buffer, int buflen); | |
| 1207 | 1208 | |
| 1208 | 1209 | /* Is the vma a continuation of the stack vma above it? */ |
| 1209 | 1210 | static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr) |
| @@ -1719,6 +1719,24 @@ static inline pid_t task_tgid_vnr(struct task_struct *tsk) · 1718 unmodified lines | ||
| 1719 | 1719 | } |
| 1720 | 1720 | |
| 1721 | 1721 | |
| 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 | + | |
| 1722 | 1740 | static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk, |
| 1723 | 1741 | struct pid_namespace *ns) |
| 1724 | 1742 | { |
| @@ -1758,7 +1776,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk) · 33 unmodified lines | ||
| 1758 | 1776 | * |
| 1759 | 1777 | * Return: 1 if the process is alive. 0 otherwise. |
| 1760 | 1778 | */ |
| 1761 | −static inline int pid_alive(struct task_struct *p) | |
| 1779 | +static inline int pid_alive(const struct task_struct *p) | |
| 1762 | 1780 | { |
| 1763 | 1781 | return p->pids[PIDTYPE_PID].pid != NULL; |
| 1764 | 1782 | } |
| @@ -70,7 +70,6 @@ · 69 unmodified lines | ||
| 70 | 70 | #define AUDIT_TTY_SET 1017 /* Set TTY auditing status */ |
| 71 | 71 | #define AUDIT_SET_FEATURE 1018 /* Turn an audit feature on or off */ |
| 72 | 72 | #define AUDIT_GET_FEATURE 1019 /* Get which features are enabled */ |
| 73 | −#define AUDIT_FEATURE_CHANGE 1020 /* audit log listing feature changes */ | |
| 74 | 73 | |
| 75 | 74 | #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ |
| 76 | 75 | #define AUDIT_USER_AVC 1107 /* We filter this differently */ |
| @@ -109,6 +108,8 @@ · 32 unmodified lines | ||
| 109 | 108 | #define AUDIT_NETFILTER_PKT 1324 /* Packets traversing netfilter chains */ |
| 110 | 109 | #define AUDIT_NETFILTER_CFG 1325 /* Netfilter chain modifications */ |
| 111 | 110 | #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 */ | |
| 112 | 113 | |
| 113 | 114 | #define AUDIT_AVC 1400 /* SE Linux avc denial or grant */ |
| 114 | 115 | #define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */ |
| @@ -308,8 +308,12 @@ struct vfs_cap_data { · 307 unmodified lines | ||
| 308 | 308 | |
| 309 | 309 | #define CAP_LEASE 28 |
| 310 | 310 | |
| 311 | +/* Allow writing the audit log via unicast netlink socket */ | |
| 312 | + | |
| 311 | 313 | #define CAP_AUDIT_WRITE 29 |
| 312 | 314 | |
| 315 | +/* Allow configuration of audit via unicast netlink socket */ | |
| 316 | + | |
| 313 | 317 | #define CAP_AUDIT_CONTROL 30 |
| 314 | 318 | |
| 315 | 319 | #define CAP_SETFCAP 31 |