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

[Stephen Rothwell]

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                    s...@canb.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);
  

pgpVRt02SUbD_.pgp
Description: OpenPGP digital signature