summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-07-12 00:33:41 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-07-12 00:33:41 +0300
commit23458ac91dc8e9a30c95b4208727f7e053eb5ff8 (patch)
tree3d39f48972f2dd3cccf4c5f9ec497d93bb3167a4 /fs/btrfs
parent8e59a6a7a4fa0bbcd174ea75f1da9531d3857937 (diff)
parentdb7cfc380900bc4243b09623fd72fabe0a8ff23b (diff)
parent3418357a32db6c8ce5e4417964bac1edcc3f281a (diff)
downloadlinux-23458ac91dc8e9a30c95b4208727f7e053eb5ff8.tar.xz
Merge tags 'free-mq_sysctls-for-v5.19' and 'ptrace_unfreeze_fix-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull ipc namespace fix from Eric Biederman: "This fixes a bug with error handling if ipc creation fails that was reported by syzbot" For completeness, this also pulls the ptrace_unfreeze_fix tag that contains the original version of one of the hotfixes that I manually applied earlier so that it would be fixed in rc6. * tag 'free-mq_sysctls-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: ipc: Free mq_sysctls if ipc namespace creation failed * tag 'ptrace_unfreeze_fix-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: ptrace: fix clearing of JOBCTL_TRACED in ptrace_unfreeze_traced()