From: Mark Brown <broonie@kernel•org>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>, bpf <bpf@vger•kernel.org>,
Networking <netdev@vger•kernel.org>
Cc: Christian Brauner <brauner@kernel•org>,
Deepanshu Kartikey <kartikey406@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the bpf-next tree with the vfs-brauner tree
Date: Thu, 4 Jun 2026 13:59:26 +0100 [thread overview]
Message-ID: <aiF2rsdpUb5LuhmZ@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
kernel/bpf/inode.c
between commit:
a146500e11445 ("bpf: Add simple xattr support to bpffs")
from the vfs-brauner tree and commit:
b93c55b4932dd ("bpf: fix UAF by restoring RCU-delayed inode freeing in bpffs")
from the bpf-next tree.
This merge resolution definitely needs a double check.
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/inode.c
index c3f79b5a2f8c0,188c774a469ca..0000000000000
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@@ -842,9 -768,12 +842,13 @@@ static void bpf_destroy_inode(struct in
if (!bpf_inode_type(inode, &type))
bpf_any_put(inode->i_private, type);
+ simple_xattrs_free(&opts->xa_cache, &bi->xattrs, NULL);
}
+ /*
+ * Called after RCU grace period - safe to free inode and anything
+ * that might be accessed by RCU pathwalk (inode fields, i_link).
+ */
static void bpf_free_inode(struct inode *inode)
{
if (S_ISLNK(inode->i_mode))
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-06-04 12:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-04 12:59 Mark Brown [this message]
2026-06-04 18:14 ` linux-next: manual merge of the bpf-next tree with the vfs-brauner tree Daniel Borkmann
-- strict thread matches above, loose matches on Subject: below --
2025-06-27 2:12 Stephen Rothwell
2025-06-27 2:17 ` Alexei Starovoitov
2025-06-27 7:50 ` Stephen Rothwell
2024-08-14 0:56 Stephen Rothwell
2024-08-14 1:48 ` Al Viro
2024-09-15 23:42 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aiF2rsdpUb5LuhmZ@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=brauner@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=kartikey406@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox