linux-next: manual merge of the bpf-next tree with the vfs-brauner tree

[Mark Brown]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  kernel/bpf/token.c

between commit:

  64cbb36448ff2 ("file: make struct fd_prepare const and kill its err field")

from the vfs-brauner tree and commit:

  f52b699c88634 ("bpf: Don't leak the inode when token creation fails")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc kernel/bpf/token.c
index da915a4f972b1,19660ef95ddbd..0000000000000
--- a/kernel/bpf/token.c
+++ b/kernel/bpf/token.c
@@@ -169,8 -169,11 +169,11 @@@ int bpf_token_create(union bpf_attr *at
  	FD_PREPARE(fdf, O_CLOEXEC,
  		   alloc_file_pseudo(inode, path.mnt, BPF_TOKEN_INODE_NAME,
  				     O_RDWR, &bpf_token_fops));
- 	if (fdf->fd < 0)
 -	if (fdf.err) {
++	if (fdf->fd < 0) {
+ 		/* no file took over the inode reference */
+ 		iput(inode);
 -		return fdf.err;
 +		return fdf->fd;
+ 	}
  
  	token = kzalloc_obj(*token, GFP_USER);
  	if (!token)

Attachment: signature.asc
Description: PGP signature