Re: [PATCH ghak105 V1 1/2] audit: clean up AUDITSYSCALL prototypes and stubs

[Paul Moore]

On Tue, Jan 22, 2019 at 5:08 PM Richard Guy Briggs <rgb@xxxxxxxxxx> wrote:
>
> Pull together all the audit syscall watch, mark and tree prototypes and
> stubs into the same ifdef.
>
> Signed-off-by: Richard Guy Briggs <rgb@xxxxxxxxxx>
> ---
>  kernel/audit.h | 64 ++++++++++++++++++++++++++++++----------------------------
>  1 file changed, 33 insertions(+), 31 deletions(-)

Looks good, merged.

> diff --git a/kernel/audit.h b/kernel/audit.h
> index 6ffb70575082..22ef49b76daa 100644
> --- a/kernel/audit.h
> +++ b/kernel/audit.h
> @@ -267,25 +267,47 @@ extern void audit_log_d_path_exe(struct audit_buffer *ab,
>  extern struct tty_struct *audit_get_tty(void);
>  extern void audit_put_tty(struct tty_struct *tty);
>
> -/* audit watch functions */
> +/* audit watch/mark/tree functions */
>  #ifdef CONFIG_AUDITSYSCALL
>  extern void audit_put_watch(struct audit_watch *watch);
>  extern void audit_get_watch(struct audit_watch *watch);
> -extern int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op);
> +extern int audit_to_watch(struct audit_krule *krule, char *path, int len,
> +                         u32 op);
>  extern int audit_add_watch(struct audit_krule *krule, struct list_head **list);
>  extern void audit_remove_watch_rule(struct audit_krule *krule);
>  extern char *audit_watch_path(struct audit_watch *watch);
> -extern int audit_watch_compare(struct audit_watch *watch, unsigned long ino, dev_t dev);
> +extern int audit_watch_compare(struct audit_watch *watch, unsigned long ino,
> +                              dev_t dev);
>
> -extern struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pathname, int len);
> +extern struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule,
> +                                                   char *pathname, int len);
>  extern char *audit_mark_path(struct audit_fsnotify_mark *mark);
>  extern void audit_remove_mark(struct audit_fsnotify_mark *audit_mark);
>  extern void audit_remove_mark_rule(struct audit_krule *krule);
> -extern int audit_mark_compare(struct audit_fsnotify_mark *mark, unsigned long ino, dev_t dev);
> +extern int audit_mark_compare(struct audit_fsnotify_mark *mark,
> +                             unsigned long ino, dev_t dev);
>  extern int audit_dupe_exe(struct audit_krule *new, struct audit_krule *old);
> -extern int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark *mark);
> +extern int audit_exe_compare(struct task_struct *tsk,
> +                            struct audit_fsnotify_mark *mark);
>
> -#else
> +extern struct audit_chunk *audit_tree_lookup(const struct inode *inode);
> +extern void audit_put_chunk(struct audit_chunk *chunk);
> +extern bool audit_tree_match(struct audit_chunk *chunk,
> +                            struct audit_tree *tree);
> +extern int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op);
> +extern int audit_add_tree_rule(struct audit_krule *rule);
> +extern int audit_remove_tree_rule(struct audit_krule *rule);
> +extern void audit_trim_trees(void);
> +extern int audit_tag_tree(char *old, char *new);
> +extern const char *audit_tree_path(struct audit_tree *tree);
> +extern void audit_put_tree(struct audit_tree *tree);
> +extern void audit_kill_trees(struct audit_context *context);
> +
> +extern int audit_signal_info(int sig, struct task_struct *t);
> +extern void audit_filter_inodes(struct task_struct *tsk,
> +                               struct audit_context *ctx);
> +extern struct list_head *audit_killed_trees(void);
> +#else /* CONFIG_AUDITSYSCALL */
>  #define audit_put_watch(w) {}
>  #define audit_get_watch(w) {}
>  #define audit_to_watch(k, p, l, o) (-EINVAL)
> @@ -301,21 +323,7 @@ extern void audit_log_d_path_exe(struct audit_buffer *ab,
>  #define audit_mark_compare(m, i, d) 0
>  #define audit_exe_compare(t, m) (-EINVAL)
>  #define audit_dupe_exe(n, o) (-EINVAL)
> -#endif /* CONFIG_AUDITSYSCALL */
>
> -#ifdef CONFIG_AUDITSYSCALL
> -extern struct audit_chunk *audit_tree_lookup(const struct inode *inode);
> -extern void audit_put_chunk(struct audit_chunk *chunk);
> -extern bool audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree);
> -extern int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op);
> -extern int audit_add_tree_rule(struct audit_krule *rule);
> -extern int audit_remove_tree_rule(struct audit_krule *rule);
> -extern void audit_trim_trees(void);
> -extern int audit_tag_tree(char *old, char *new);
> -extern const char *audit_tree_path(struct audit_tree *tree);
> -extern void audit_put_tree(struct audit_tree *tree);
> -extern void audit_kill_trees(struct audit_context *context);
> -#else
>  #define audit_remove_tree_rule(rule) BUG()
>  #define audit_add_tree_rule(rule) -EINVAL
>  #define audit_make_tree(rule, str, op) -EINVAL
> @@ -324,7 +332,10 @@ extern void audit_log_d_path_exe(struct audit_buffer *ab,
>  #define audit_tag_tree(old, new) -EINVAL
>  #define audit_tree_path(rule) ""       /* never called */
>  #define audit_kill_trees(context) BUG()
> -#endif
> +
> +#define audit_signal_info(s, t) AUDIT_DISABLED
> +#define audit_filter_inodes(t, c) AUDIT_DISABLED
> +#endif /* CONFIG_AUDITSYSCALL */
>
>  extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len);
>
> @@ -334,14 +345,5 @@ extern void audit_log_d_path_exe(struct audit_buffer *ab,
>
>  extern int audit_filter(int msgtype, unsigned int listtype);
>
> -#ifdef CONFIG_AUDITSYSCALL
> -extern int audit_signal_info(int sig, struct task_struct *t);
> -extern void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx);
> -extern struct list_head *audit_killed_trees(void);
> -#else
> -#define audit_signal_info(s,t) AUDIT_DISABLED
> -#define audit_filter_inodes(t,c) AUDIT_DISABLED
> -#endif
> -
>  extern void audit_ctl_lock(void);
>  extern void audit_ctl_unlock(void);
> --
> 1.8.3.1
>


-- 
paul moore
www.paul-moore.com