aush^H^Hdit queue
By all rights it's Eric's stuff; I hadn't got around to resurrecting
audit.git until the end of December and this is what was in his tree (minus a couple of things obsoleted by Miklos' "fsnotify: don't BUG in fsnotify_destroy_mark()"). Please, pull fromgit://git.kernel.org:/pub/scm/linux/kernel/git/viro/audit.git for-linus
Shortlog:
Eric Paris (23):
audit: make filetype matching consistent with other filters
audit: dynamically allocate audit_names when not enough space is in the names array
audit: drop the meaningless and format breaking word 'user'
audit: check current inode and containing object when filtering on major and minor
seccomp: audit abnormal end to a process due to seccomp
Audit: push audit success and retcode into arch ptrace.h
audit: ia32entry.S sign extend error codes when calling 64 bit code
audit: inline audit_syscall_entry to reduce burden on archs
audit: remove AUDIT_SETUP_CONTEXT as it isn't used
audit: drop some potentially inadvisable likely notations
audit: inline checks for not needing to collect aux records
audit: drop audit_set_macxattr as it doesn't do anything
audit: inline audit_free to simplify the look of generic code
audit: reject entry,always rules
audit: remove audit_finish_fork as it can't be called
audit: allow matching on obj_uid
audit: allow audit matching on inode gid
audit: remove task argument to audit_set_loginuid
audit: only allow tasks to set their loginuid if it is -1
audit: do not call audit_getname on error
audit: allow interfield comparison in audit rules
audit: complex interfield comparison helper
audit: allow interfield comparison between gid and ogid
Kees Cook (2):
audit: treat s_id as an untrusted string
audit: no leading space in audit_log_d_path prefix
Nathaniel Husted (1):
Kernel: Audit Support For The ARM Platform
Peter Moody (2):
audit: implement all object interfield comparisons
audit: comparison on interprocess fields
Xi Wang (1):
audit: fix signedness bug in audit_log_execve_info()
Diffstat:
arch/arm/include/asm/kprobes.h | 1 - arch/arm/include/asm/ptrace.h | 5 + arch/arm/include/asm/thread_info.h | 6 + arch/arm/kernel/entry-common.S | 4 +- arch/arm/kernel/ptrace.c | 16 +- arch/ia64/include/asm/ptrace.h | 13 +- arch/ia64/kernel/ptrace.c | 18 +- arch/microblaze/include/asm/ptrace.h | 5 + arch/microblaze/kernel/ptrace.c | 9 +- arch/mips/include/asm/ptrace.h | 14 +- arch/mips/kernel/ptrace.c | 11 +- arch/powerpc/include/asm/ptrace.h | 13 +- arch/powerpc/kernel/ptrace.c | 30 +- arch/s390/include/asm/ptrace.h | 6 +- arch/s390/kernel/ptrace.c | 15 +- arch/sh/include/asm/ptrace_32.h | 5 +- arch/sh/include/asm/ptrace_64.h | 5 +- arch/sh/kernel/ptrace_32.c | 11 +- arch/sh/kernel/ptrace_64.c | 11 +- arch/sparc/include/asm/ptrace.h | 10 +- arch/sparc/kernel/ptrace_64.c | 28 +- arch/um/kernel/ptrace.c | 20 +- arch/x86/ia32/ia32entry.S | 14 +- arch/x86/kernel/entry_32.S | 10 +- arch/x86/kernel/entry_64.S | 14 +- arch/x86/kernel/ptrace.c | 25 +- arch/x86/kernel/vm86_32.c | 4 +- arch/x86/um/shared/sysdep/ptrace.h | 5 + arch/xtensa/kernel/ptrace.c | 3 +- fs/namei.c | 28 +- fs/proc/base.c | 5 +- include/linux/audit.h | 116 +++++- include/linux/ptrace.h | 10 + init/Kconfig | 16 +- kernel/audit.c | 4 +- kernel/audit.h | 6 +- kernel/auditfilter.c | 17 +- kernel/auditsc.c | 735 +++++++++++++++++++++------------- kernel/exit.c | 3 +- kernel/fork.c | 2 - kernel/seccomp.c | 2 + security/integrity/ima/ima_audit.c | 8 +- security/lsm_audit.c | 27 +- 43 files changed, 810 insertions(+), 500 deletions(-)
Quoted 5 lines · Al Viro
By all rights it's Eric's stuff; I hadn't got around to resurrecting audit.git until the end of December and this is what was in his tree (minus a couple of things obsoleted by Miklos' "fsnotify: don't BUG in
fsnotify_destroy_mark()"). Please, pull fromgit://git.kernel.org:/pub/scm/linux/kernel/git/viro/audit.gitfor-linus
Ugh.
You have an extra colon there in that git tree address. Please fix your script.
But even more annoyingly, this is from the "help text" for one of the new options:
The config option toggles if a task setting it's loginuid requires CAP_SYS_AUDITCONTROL or if that task should require no special permissions but should instead only allow setting its loginuid if it was never previously set. On systems which use systemd or a similar central
...
Christ people. It's/its. One is a contraction of "it is" (or "it has"), the other is the genitive (aka possessive form) of "it".
Yeah, I'm sensitive. It hurts my head.
Linus
Quoted 10 lines · Linus Torvalds
Quoted 5 lines · Al Viro
? ? ? ?By all rights it's Eric's stuff; I hadn't got around to resurrecting audit.git until the end of December and this is what was in his tree (minus a couple of things obsoleted by Miklos' "fsnotify: don't BUG in
fsnotify_destroy_mark()"). ?Please, pull fromgit://git.kernel.org:/pub/scm/linux/kernel/git/viro/audit.gitfor-linusUgh.
You have an extra colon there in that git tree address. Please fix your script.
*blink* Ah, I see... That's not a script, actually - that's cut'n'paste from .git/config, where it's in the form "[email protected]:/pub/scm/..." Normally cut'n'paste starts at slash, this time I got lazy and blindly hit it from ".kernel"...
Anyway, that should've been a part of script. Fixed...
Quoted 4 lines
But even more annoyingly, this is from the "help text" for one of the new options:
The config option toggles if a task setting it's loginuid requires
*cringe*
Missed that one (and normally I do hunt for typos in commit messaged when applying). What do you prefer - fix on top of the branch or --amend to commit in question + cherry-pick of the rest on top of amended? Alternatively, that could be --amend'ed in the merge commit...
Quoted 5 lines · Al Viro
Missed that one (and normally I do hunt for typos in commit messaged when applying). What do you prefer - fix on top of the branch or --amend to commit in question + cherry-pick of the rest on top of amended? Alternatively, that could be --amend'ed in the merge commit...
I'll fix it up in the merge.
Linus
Typo in init/Kconfig fixed, amended into the commit in question, the rest cherry-picked on top of the amended commit.
git://git.kernel.org:/pub/scm/linux/kernel/git/viro/audit.git for-linus2
Shortlog:
Eric Paris (23):
audit: make filetype matching consistent with other filters
audit: dynamically allocate audit_names when not enough space is in the names array
audit: drop the meaningless and format breaking word 'user'
audit: check current inode and containing object when filtering on major and minor
seccomp: audit abnormal end to a process due to seccomp
Audit: push audit success and retcode into arch ptrace.h
audit: ia32entry.S sign extend error codes when calling 64 bit code
audit: inline audit_syscall_entry to reduce burden on archs
audit: remove AUDIT_SETUP_CONTEXT as it isn't used
audit: drop some potentially inadvisable likely notations
audit: inline checks for not needing to collect aux records
audit: drop audit_set_macxattr as it doesn't do anything
audit: inline audit_free to simplify the look of generic code
audit: reject entry,always rules
audit: remove audit_finish_fork as it can't be called
audit: allow matching on obj_uid
audit: allow audit matching on inode gid
audit: remove task argument to audit_set_loginuid
audit: only allow tasks to set their loginuid if it is -1
audit: do not call audit_getname on error
audit: allow interfield comparison in audit rules
audit: complex interfield comparison helper
audit: allow interfield comparison between gid and ogid
Kees Cook (2):
audit: treat s_id as an untrusted string
audit: no leading space in audit_log_d_path prefix
Nathaniel Husted (1):
Kernel: Audit Support For The ARM Platform
Peter Moody (2):
audit: implement all object interfield comparisons
audit: comparison on interprocess fields
Xi Wang (1):
audit: fix signedness bug in audit_log_execve_info()
Diffstat:
arch/arm/include/asm/kprobes.h | 1 - arch/arm/include/asm/ptrace.h | 5 + arch/arm/include/asm/thread_info.h | 6 + arch/arm/kernel/entry-common.S | 4 +- arch/arm/kernel/ptrace.c | 16 +- arch/ia64/include/asm/ptrace.h | 13 +- arch/ia64/kernel/ptrace.c | 18 +- arch/microblaze/include/asm/ptrace.h | 5 + arch/microblaze/kernel/ptrace.c | 9 +- arch/mips/include/asm/ptrace.h | 14 +- arch/mips/kernel/ptrace.c | 11 +- arch/powerpc/include/asm/ptrace.h | 13 +- arch/powerpc/kernel/ptrace.c | 30 +- arch/s390/include/asm/ptrace.h | 6 +- arch/s390/kernel/ptrace.c | 15 +- arch/sh/include/asm/ptrace_32.h | 5 +- arch/sh/include/asm/ptrace_64.h | 5 +- arch/sh/kernel/ptrace_32.c | 11 +- arch/sh/kernel/ptrace_64.c | 11 +- arch/sparc/include/asm/ptrace.h | 10 +- arch/sparc/kernel/ptrace_64.c | 28 +- arch/um/kernel/ptrace.c | 20 +- arch/x86/ia32/ia32entry.S | 14 +- arch/x86/kernel/entry_32.S | 10 +- arch/x86/kernel/entry_64.S | 14 +- arch/x86/kernel/ptrace.c | 25 +- arch/x86/kernel/vm86_32.c | 4 +- arch/x86/um/shared/sysdep/ptrace.h | 5 + arch/xtensa/kernel/ptrace.c | 3 +- fs/namei.c | 28 +- fs/proc/base.c | 5 +- include/linux/audit.h | 116 +++++- include/linux/ptrace.h | 10 + init/Kconfig | 16 +- kernel/audit.c | 4 +- kernel/audit.h | 6 +- kernel/auditfilter.c | 17 +- kernel/auditsc.c | 735 +++++++++++++++++++++------------- kernel/exit.c | 3 +- kernel/fork.c | 2 - kernel/seccomp.c | 2 + security/integrity/ima/ima_audit.c | 8 +- security/lsm_audit.c | 27 +- 43 files changed, 810 insertions(+), 500 deletions(-)
Quoted 4 lines · Al Viro
Typo in init/Kconfig fixed, amended into the commit in question, the rest cherry-picked on top of the amended commit.
git://git.kernel.org:/pub/scm/linux/kernel/git/viro/audit.gitfor-linus2
Grrrrr... OK, I really need to get some coffee and test the damn sed script before using it. _This_ time it was a bug in the script ;-/