audit: move extern declarations to audit.h
PATCH 5/7 audit: move extern declarations to audit.h
Leave audit_sig_{uid|pid|sid} protected by #ifdef CONFIG_AUDITSYSCALL.
Noticed by sparse:kernel/audit.c:73:6: warning: symbol 'audit_ever_enabled' was not declared. Should it be static? kernel/audit.c:100:8: warning: symbol 'audit_sig_uid' was not declared. Should it be static? kernel/audit.c:101:8: warning: symbol 'audit_sig_pid' was not declared. Should it be static? kernel/audit.c:102:6: warning: symbol 'audit_sig_sid' was not declared. Should it be static? kernel/audit.c:117:23: warning: symbol 'audit_ih' was not declared. Should it be static? kernel/auditfilter.c:78:18: warning: symbol 'audit_filter_list' was not declared. Should it be static?
Signed-off-by Harvey Harrison <[email protected]>
--- kernel/audit.h | 11 +++++++++++ kernel/auditfilter.c | 5 ----- kernel/auditsc.c | 6 ------ 3 files changed, 11 insertions(+), 11 deletions(-)
kernel/audit.h +11 -0
@@ -99,6 +99,9 @@ struct audit_entry {struct audit_krule rule; }; +extern int audit_enabled; +extern int audit_ever_enabled; +extern int audit_pid;#define AUDIT_INODE_BUCKETS 32
@@ -129,6 +132,9 @@ struct audit_netlink_list {int audit_send_list (void *);struct inotify_watch ; +/* Inotify handle */ +extern struct inotify_handle *audit_ih; +extern void audit_free_parent (struct inotify_watch *);extern void audit_handle_ievent (struct inotify_watch *,u32 ,u32 ,u32 ,const char *,struct inode *);
@@ -136,6 +142,7 @@ extern int selinux_audit_rule_update(void);extern struct mutex audit_filter_mutex;extern void audit_free_rule_rcu (struct rcu_head *); +extern struct list_head audit_filter_list[];#ifdef CONFIG_AUDIT_TREE extern struct audit_chunk *audit_tree_lookup (const struct inode *);
@@ -162,6 +169,10 @@ extern void audit_put_tree(struct audit_tree *);extern char *audit_unpack_string (void **,size_t *,size_t ); +extern pid_t audit_sig_pid; +extern uid_t audit_sig_uid; +extern u32 audit_sig_sid; +#ifdef CONFIG_AUDITSYSCALL extern int __audit_signal_info (int sig,struct task_struct *t);static inline int audit_signal_info (int sig,struct task_struct *t)
kernel/auditfilter.c +0 -5
@@ -89,14 +89,9 @@ struct list_head audit_filter_list[AUDIT_NR_FILTERS] = {DEFINE_MUTEX (audit_filter_mutex); -/* Inotify handle */ -extern struct inotify_handle *audit_ih; -/* Inotify events we care about. */ #define AUDIT_IN_WATCH IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF -extern int audit_enabled; -void audit_free_parent (struct inotify_watch *i_watch) {struct audit_parent *parent;
kernel/auditsc.c +0 -6
@@ -69,9 +69,6 @@#include "audit.h" -extern struct list_head audit_filter_list[]; -extern int audit_ever_enabled; -/* AUDIT_NAMES is the number of slots we reserve in the audit_context * for saving names from getname(). */ #define AUDIT_NAMES 20
@@ -2360,9 +2357,6 @@ int __audit_signal_info(int sig, struct task_struct *t)struct audit_aux_data_pids *axp;struct task_struct *tsk = current;struct audit_context *ctx = tsk->audit_context; -extern pid_t audit_sig_pid; -extern uid_t audit_sig_uid; -extern u32 audit_sig_sid;if (audit_pid && t->tgid == audit_pid) {if (sig ==SIGTERM || sig ==SIGHUP || sig ==SIGUSR1 ) {
Signature · 1 line
1.5.5.rc1.135.g8527