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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150120150423.16fb71c8@canb.auug.org.au>
Date:	Tue, 20 Jan 2015 15:04:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Moore <paul@...l-moore.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Drysdale <drysdale@...gle.com>
Subject: linux-next: manual merge of the audit tree with Linus' tree

Hi Paul,

Today's linux-next merge of the audit tree got a conflict in fs/exec.c
between commit 51f39a1f0cea ("syscalls: implement execveat() system
call") from Linus' tree and commit 5dc5218840e1 ("fs: create proper
filename objects using getname_kernel()") from the audit tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/exec.c
index ad8798e26be9,d067771af6d4..000000000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -794,8 -789,15 +794,15 @@@ exit
  
  struct file *open_exec(const char *name)
  {
- 	struct filename tmp = { .name = name };
- 	return do_open_execat(AT_FDCWD, &tmp, 0);
+ 	struct file *file;
+ 	struct filename *tmp;
+ 
+ 	tmp = getname_kernel(name);
+ 	if (unlikely(IS_ERR(tmp)))
+ 		return (void *)tmp;
 -	file = do_open_exec(tmp);
++	file = do_open_execat(AT_FDCWD, tmp, 0);
+ 	putname(tmp);
+ 	return file;
  }
  EXPORT_SYMBOL(open_exec);
  

Content of type "application/pgp-signature" skipped