Skip to contentSkip to conversation

x86: audit.c remove unnecessary global arrays

RFC PATCH In review Jaswinder Singh Rajput 2 participants 3 messages May 13, 2009 x86

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 x86: audit.c remove unnecessary global arrays

ia32_dir_class[], ia32_write_class[], ia32_read_class[], ia32_chattr_class[] and ia32_signal_class[] are used only by arch/x86/kernel/audit_64.c which can be replace by local variables:

dir_class[], write_class[], read_class[], chattr_class[] and signal_class[]

---
 arch/x86/ia32/audit.c      |   25 -------------------------
 arch/x86/kernel/audit_64.c |   15 +++++----------
 2 files changed, 5 insertions(+), 35 deletions(-)
arch/x86/ia32/audit.c +0 -25
index 5d7b381..ee8ce50 100644
@@ -1,30 +1,5 @@
 #include <asm/unistd_32.h>
 
-unsigned ia32_dir_class[] = {
-#include <asm-generic/audit_dir_write.h>
-~0U
-};
-
-unsigned ia32_chattr_class[] = {
-#include <asm-generic/audit_change_attr.h>
-~0U
-};
-
-unsigned ia32_write_class[] = {
-#include <asm-generic/audit_write.h>
-~0U
-};
-
-unsigned ia32_read_class[] = {
-#include <asm-generic/audit_read.h>
-~0U
-};
-
-unsigned ia32_signal_class[] = {
-#include <asm-generic/audit_signal.h>
-~0U
-};
-
 int ia32_classify_syscall(unsigned syscall)
 {
 	switch (syscall) {
arch/x86/kernel/audit_64.c +5 -10
index 06d3e5a..aede8d2 100644
@@ -59,16 +59,11 @@ int audit_classify_syscall(int abi, unsigned syscall)
 static int __init audit_classes_init(void)
 {
 #ifdef CONFIG_IA32_EMULATION
-	extern __u32 ia32_dir_class[];
-	extern __u32 ia32_write_class[];
-	extern __u32 ia32_read_class[];
-	extern __u32 ia32_chattr_class[];
-	extern __u32 ia32_signal_class[];
-	audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);
-	audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);
-	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
-	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
-	audit_register_class(AUDIT_CLASS_SIGNAL_32, ia32_signal_class);
+	audit_register_class(AUDIT_CLASS_WRITE_32, write_class);
+	audit_register_class(AUDIT_CLASS_READ_32, read_class);
+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR_32, chattr_class);
+	audit_register_class(AUDIT_CLASS_SIGNAL_32, signal_class);
 #endif
 	audit_register_class(AUDIT_CLASS_WRITE, write_class);
 	audit_register_class(AUDIT_CLASS_READ, read_class);
Signature · 1 line
1.6.0.6
#1 lore raw

Re: [RFC][PATCH -tip] x86: audit.c remove unnecessary global arraysn

Quoted 5 lines · Jaswinder Singh Rajput

ia32_dir_class[], ia32_write_class[], ia32_read_class[], ia32_chattr_class[] and ia32_signal_class[] are used only by arch/x86/kernel/audit_64.c which can be replace by local variables:

dir_class[], write_class[], read_class[], chattr_class[] and signal_class[]

Groan, it can be replaced by local variables, but it does not result in the same functionality.

These audit classes are arrays of syscall numbers, which are different for 32 and 64 bit. ia32/audit.c includes unistd_32.h not unistd.h for exactly this reason.

Thanks,

tglx

#2 lore raw

Re: [RFC][PATCH -tip] x86: audit.c remove unnecessary global arraysn

Quoted 6 lines · Thomas Gleixner
Quoted 4 lines · Jaswinder Singh Rajput

ia32_dir_class[], ia32_write_class[], ia32_read_class[], ia32_chattr_class[] and ia32_signal_class[] are used only by arch/x86/kernel/audit_64.c which can be replace by local variables:

Quoted 9 lines
Quoted 1 line

dir_class[], write_class[], read_class[], chattr_class[] and signal_class[]

Groan, it can be replaced by local variables, but it does not result in the same functionality.

These audit classes are arrays of syscall numbers, which are different for 32 and 64 bit. ia32/audit.c includes unistd_32.h not unistd.h for exactly this reason.

Thanks, got it :-)

--
JSR