On 05/07/2013 11:44 PM, Aristeu Rozanski wrote:
> On Tue, May 07, 2013 at 10:20:30AM +0800, Gao feng wrote:
>> diff --git a/include/linux/audit.h b/include/linux/audit.h
>> index 684599b..33e6584 100644
>> --- a/include/linux/audit.h
>> +++ b/include/linux/audit.h
>> @@ -441,7 +441,8 @@ extern int audit_filter_type(int type);
>> extern int audit_receive_filter(int type, int pid, int seq,
>> void *data, size_t datasz, kuid_t loginuid,
>> u32 sessionid, u32 sid);
>> -extern int audit_enabled;
>> +#define audit_enabled (init_user_ns.audit.enabled)
>> +#define audit_enabled_ns (ns->audit.enabled)
>> #else /* CONFIG_AUDIT */
>> static inline __printf(4, 5)
>> void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
>> @@ -487,6 +488,7 @@ static inline void audit_set_user_ns(struct user_namespace *ns)
>> static inline void audit_free_user_ns(struct user_namespace *ns)
>> { }
>> #define audit_enabled 0
>> +#define audit_enabled_ns(ns) 0
>
> conflicting definitions here. maybe the first one should be
> #define audit_enabled_ns(ns) (ns->audit.enabled)?
>
Yes, it should be audit_enabled_ns(ns), I will fix this in next round.
>> @@ -285,14 +282,15 @@ static int audit_do_config_change(char *function_name, int *to_change,
>> u32 sid)
>> {
>> int allow_changes, rc = 0, old = *to_change;
>> + struct user_namespace *ns = current_user_ns();
>>
>> /* check if we are locked */
>> - if (audit_enabled == AUDIT_LOCKED)
>> + if (ns->audit.enabled == AUDIT_LOCKED)
>
> then you don't use the macro you introduced?
will fix this too.
>
>> @@ -609,7 +608,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type,
>> char *ctx = NULL;
>> u32 len;
>>
>> - if (!audit_enabled) {
>> + if (!init_user_ns.audit.enabled) {
>> *ab = NULL;
>> return rc;
>> }
>
> same here
>
Get it.
Thanks for your comments!
Gao
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/containers
