From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752860AbbFAP7W (ORCPT ); Mon, 1 Jun 2015 11:59:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60333 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751479AbbFAP7P (ORCPT ); Mon, 1 Jun 2015 11:59:15 -0400 Date: Mon, 1 Jun 2015 11:59:11 -0400 From: Richard Guy Briggs To: Stephen Rothwell Cc: Paul Moore , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Morris Subject: Re: linux-next: manual merge of the audit tree with Linus' tree Message-ID: <20150601155911.GA5894@madcap2.tricolour.ca> References: <20150601163001.01003d92@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150601163001.01003d92@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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@canb.auug.org.au > > 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 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