forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/viro/audit-current * 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] audit: AUDIT_PERM support [PATCH] audit: more syscall classes added [PATCH] syscall classes hookup for ppc and s390 [PATCH] update audit rule change messages [PATCH] sanity check audit_buffer [PATCH] fix ppid bug in 2.6.18 kernel
- Loading branch information
Showing
18 changed files
with
483 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
#include <linux/init.h> | ||
#include <linux/types.h> | ||
#include <linux/audit.h> | ||
#include <asm/unistd.h> | ||
|
||
static unsigned dir_class[] = { | ||
#include <asm-generic/audit_dir_write.h> | ||
~0U | ||
}; | ||
|
||
static unsigned read_class[] = { | ||
#include <asm-generic/audit_read.h> | ||
~0U | ||
}; | ||
|
||
static unsigned write_class[] = { | ||
#include <asm-generic/audit_write.h> | ||
~0U | ||
}; | ||
|
||
static unsigned chattr_class[] = { | ||
#include <asm-generic/audit_change_attr.h> | ||
~0U | ||
}; | ||
|
||
int audit_classify_syscall(int abi, unsigned syscall) | ||
{ | ||
#ifdef CONFIG_PPC64 | ||
extern int ppc32_classify_syscall(unsigned); | ||
if (abi == AUDIT_ARCH_PPC) | ||
return ppc32_classify_syscall(syscall); | ||
#endif | ||
switch(syscall) { | ||
case __NR_open: | ||
return 2; | ||
case __NR_openat: | ||
return 3; | ||
case __NR_socketcall: | ||
return 4; | ||
case __NR_execve: | ||
return 5; | ||
default: | ||
return 0; | ||
} | ||
} | ||
|
||
static int __init audit_classes_init(void) | ||
{ | ||
#ifdef CONFIG_PPC64 | ||
extern __u32 ppc32_dir_class[]; | ||
extern __u32 ppc32_write_class[]; | ||
extern __u32 ppc32_read_class[]; | ||
extern __u32 ppc32_chattr_class[]; | ||
audit_register_class(AUDIT_CLASS_WRITE_32, ppc32_write_class); | ||
audit_register_class(AUDIT_CLASS_READ_32, ppc32_read_class); | ||
audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ppc32_dir_class); | ||
audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class); | ||
#endif | ||
audit_register_class(AUDIT_CLASS_WRITE, write_class); | ||
audit_register_class(AUDIT_CLASS_READ, read_class); | ||
audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); | ||
audit_register_class(AUDIT_CLASS_CHATTR, chattr_class); | ||
return 0; | ||
} | ||
|
||
__initcall(audit_classes_init); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#undef __powerpc64__ | ||
#include <asm/unistd.h> | ||
|
||
unsigned ppc32_dir_class[] = { | ||
#include <asm-generic/audit_dir_write.h> | ||
~0U | ||
}; | ||
|
||
unsigned ppc32_chattr_class[] = { | ||
#include <asm-generic/audit_change_attr.h> | ||
~0U | ||
}; | ||
|
||
unsigned ppc32_write_class[] = { | ||
#include <asm-generic/audit_write.h> | ||
~0U | ||
}; | ||
|
||
unsigned ppc32_read_class[] = { | ||
#include <asm-generic/audit_read.h> | ||
~0U | ||
}; | ||
|
||
int ppc32_classify_syscall(unsigned syscall) | ||
{ | ||
switch(syscall) { | ||
case __NR_open: | ||
return 2; | ||
case __NR_openat: | ||
return 3; | ||
case __NR_socketcall: | ||
return 4; | ||
case __NR_execve: | ||
return 5; | ||
default: | ||
return 1; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
#include <linux/init.h> | ||
#include <linux/types.h> | ||
#include <linux/audit.h> | ||
#include <asm/unistd.h> | ||
|
||
static unsigned dir_class[] = { | ||
#include <asm-generic/audit_dir_write.h> | ||
~0U | ||
}; | ||
|
||
static unsigned read_class[] = { | ||
#include <asm-generic/audit_read.h> | ||
~0U | ||
}; | ||
|
||
static unsigned write_class[] = { | ||
#include <asm-generic/audit_write.h> | ||
~0U | ||
}; | ||
|
||
static unsigned chattr_class[] = { | ||
#include <asm-generic/audit_change_attr.h> | ||
~0U | ||
}; | ||
|
||
int audit_classify_syscall(int abi, unsigned syscall) | ||
{ | ||
#ifdef CONFIG_COMPAT | ||
extern int s390_classify_syscall(unsigned); | ||
if (abi == AUDIT_ARCH_S390) | ||
return s390_classify_syscall(syscall); | ||
#endif | ||
switch(syscall) { | ||
case __NR_open: | ||
return 2; | ||
case __NR_openat: | ||
return 3; | ||
case __NR_socketcall: | ||
return 4; | ||
case __NR_execve: | ||
return 5; | ||
default: | ||
return 0; | ||
} | ||
} | ||
|
||
static int __init audit_classes_init(void) | ||
{ | ||
#ifdef CONFIG_COMPAT | ||
extern __u32 s390_dir_class[]; | ||
extern __u32 s390_write_class[]; | ||
extern __u32 s390_read_class[]; | ||
extern __u32 s390_chattr_class[]; | ||
audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class); | ||
audit_register_class(AUDIT_CLASS_READ_32, s390_read_class); | ||
audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class); | ||
audit_register_class(AUDIT_CLASS_CHATTR_32, s390_chattr_class); | ||
#endif | ||
audit_register_class(AUDIT_CLASS_WRITE, write_class); | ||
audit_register_class(AUDIT_CLASS_READ, read_class); | ||
audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class); | ||
audit_register_class(AUDIT_CLASS_CHATTR, chattr_class); | ||
return 0; | ||
} | ||
|
||
__initcall(audit_classes_init); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#undef __s390x__ | ||
#include <asm/unistd.h> | ||
|
||
unsigned s390_dir_class[] = { | ||
#include <asm-generic/audit_dir_write.h> | ||
~0U | ||
}; | ||
|
||
unsigned s390_chattr_class[] = { | ||
#include <asm-generic/audit_change_attr.h> | ||
~0U | ||
}; | ||
|
||
unsigned s390_write_class[] = { | ||
#include <asm-generic/audit_write.h> | ||
~0U | ||
}; | ||
|
||
unsigned s390_read_class[] = { | ||
#include <asm-generic/audit_read.h> | ||
~0U | ||
}; | ||
|
||
int s390_classify_syscall(unsigned syscall) | ||
{ | ||
switch(syscall) { | ||
case __NR_open: | ||
return 2; | ||
case __NR_openat: | ||
return 3; | ||
case __NR_socketcall: | ||
return 4; | ||
case __NR_execve: | ||
return 5; | ||
default: | ||
return 1; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.