Re: linux-next: manual merge of the audit tree with Linus' tree

[Richard Guy Briggs]

On 15/06/01, Stephen Rothwell wrote:
> Hi Paul,
> 
> Today's linux-next merge of the audit tree got a conflict in
> security/lsm_audit.c between commit 5deeb5cece3f ("lsm: copy comm
> before calling audit_log to avoid race in string printing") from Linus'
> tree and commit 5c5bc97e2fc8 ("lsm: rename duplicate labels in
> LSM_AUDIT_DATA_TASK audit message type") from the audit tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Perfect, thanks, fix looks right.  Cheers!

> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc security/lsm_audit.c
> index 1d34277dc402,07fc99724d41..000000000000
> --- a/security/lsm_audit.c
> +++ b/security/lsm_audit.c
> @@@ -281,10 -281,8 +281,10 @@@ static void dump_common_audit_data(stru
>   		if (tsk) {
>   			pid_t pid = task_pid_nr(tsk);
>   			if (pid) {
>  +				char comm[sizeof(tsk->comm)];
> - 				audit_log_format(ab, " pid=%d comm=", pid);
> + 				audit_log_format(ab, " opid=%d ocomm=", pid);
>  -				audit_log_untrustedstring(ab, tsk->comm);
>  +				audit_log_untrustedstring(ab,
>  +				    memcpy(comm, tsk->comm, sizeof(comm)));
>   			}
>   		}
>   		break;



- RGB

--
Richard Guy Briggs <rbriggs@xxxxxxxxxx>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/