From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, "Michal Koutný" <mkoutny@suse.com>,
"Masami Ichikawa(CIP)" <masami.ichikawa@cybertrust.co.jp>,
"Tejun Heo" <tj@kernel.org>
Subject: [PATCH 5.10 06/38] cgroup-v1: Correct privileges check in release_agent writes
Date: Fri, 25 Mar 2022 16:04:50 +0100 [thread overview]
Message-ID: <20220325150419.944556173@linuxfoundation.org> (raw)
In-Reply-To: <20220325150419.757836392@linuxfoundation.org>
From: Michal Koutný <mkoutny@suse.com>
commit 467a726b754f474936980da793b4ff2ec3e382a7 upstream.
The idea is to check: a) the owning user_ns of cgroup_ns, b)
capabilities in init_user_ns.
The commit 24f600856418 ("cgroup-v1: Require capabilities to set
release_agent") got this wrong in the write handler of release_agent
since it checked user_ns of the opener (may be different from the owning
user_ns of cgroup_ns).
Secondly, to avoid possibly confused deputy, the capability of the
opener must be checked.
Fixes: 24f600856418 ("cgroup-v1: Require capabilities to set release_agent")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/stable/20220216121142.GB30035@blackbody.suse.cz/
Signed-off-by: Michal Koutný <mkoutny@suse.com>
Reviewed-by: Masami Ichikawa(CIP) <masami.ichikawa@cybertrust.co.jp>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
kernel/cgroup/cgroup-v1.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -544,6 +544,7 @@ static ssize_t cgroup_release_agent_writ
char *buf, size_t nbytes, loff_t off)
{
struct cgroup *cgrp;
+ struct cgroup_file_ctx *ctx;
BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
@@ -551,8 +552,9 @@ static ssize_t cgroup_release_agent_writ
* Release agent gets called with all capabilities,
* require capabilities to set release agent.
*/
- if ((of->file->f_cred->user_ns != &init_user_ns) ||
- !capable(CAP_SYS_ADMIN))
+ ctx = of->priv;
+ if ((ctx->ns->user_ns != &init_user_ns) ||
+ !file_ns_capable(of->file, &init_user_ns, CAP_SYS_ADMIN))
return -EPERM;
cgrp = cgroup_kn_lock_live(of->kn, false);
next prev parent reply other threads:[~2022-03-25 15:15 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 15:04 [PATCH 5.10 00/38] 5.10.109-rc1 review Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 01/38] nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 02/38] net: ipv6: fix skb_over_panic in __ip6_append_data Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 03/38] exfat: avoid incorrectly releasing for root inode Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 04/38] cgroup: Allocate cgroup_file_ctx for kernfs_open_file->priv Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 05/38] cgroup: Use open-time cgroup namespace for process migration perm checks Greg Kroah-Hartman
2022-03-25 15:04 ` Greg Kroah-Hartman [this message]
2022-03-25 15:04 ` [PATCH 5.10 07/38] tpm: Fix error handling in async work Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 08/38] staging: fbtft: fb_st7789v: reset display before initialization Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 09/38] llc: fix netdevice reference leaks in llc_ui_bind() Greg Kroah-Hartman
2022-03-26 20:09 ` Pavel Machek
2022-03-26 20:13 ` Jakub Kicinski
2022-03-26 21:35 ` Pavel Machek
2022-03-27 9:51 ` Greg Kroah-Hartman
2022-03-28 9:08 ` Pavel Machek
2022-03-28 9:13 ` Greg Kroah-Hartman
2022-03-28 9:31 ` Pavel Machek
2022-03-28 9:42 ` Greg Kroah-Hartman
2022-03-28 9:37 ` Pavel Machek
2022-03-25 15:04 ` [PATCH 5.10 10/38] swiotlb: fix info leak with DMA_FROM_DEVICE Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 11/38] swiotlb: rework "fix info leak with DMA_FROM_DEVICE" Greg Kroah-Hartman
2022-03-25 17:08 ` Linus Torvalds
2022-03-25 17:36 ` Thomas Backlund
2022-03-26 10:18 ` Greg Kroah-Hartman
2022-03-26 18:41 ` Linus Torvalds
2022-03-27 9:30 ` Greg Kroah-Hartman
2022-03-27 18:02 ` Linus Torvalds
2022-03-28 8:21 ` Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 12/38] ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 13/38] ALSA: oss: Fix PCM OSS buffer allocation overflow Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 14/38] ALSA: usb-audio: add mapping for new Corsair Virtuoso SE Greg Kroah-Hartman
2022-03-25 15:04 ` [PATCH 5.10 15/38] ALSA: hda/realtek: Add quirk for Clevo NP70PNJ Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 16/38] ALSA: hda/realtek: Add quirk for Clevo NP50PNJ Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 17/38] ALSA: hda/realtek - Fix headset mic problem for a HP machine with alc671 Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 18/38] ALSA: hda/realtek: Add quirk for ASUS GA402 Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 19/38] ALSA: pcm: Fix races among concurrent hw_params and hw_free calls Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 20/38] ALSA: pcm: Fix races among concurrent read/write and buffer changes Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 21/38] ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 22/38] ALSA: pcm: Fix races among concurrent prealloc proc writes Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 23/38] ALSA: pcm: Add stream lock during PCM reset ioctl operations Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 24/38] ALSA: usb-audio: Add mute TLV for playback volumes on RODE NT-USB Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 25/38] ALSA: cmipci: Restore aux vol on suspend/resume Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 26/38] ALSA: pci: fix reading of swapped values from pcmreg in AC97 codec Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 27/38] drivers: net: xgene: Fix regression in CRC stripping Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 28/38] netfilter: nf_tables: initialize registers in nft_do_chain() Greg Kroah-Hartman
2022-03-26 20:10 ` Pavel Machek
2022-03-25 15:05 ` [PATCH 5.10 29/38] ACPI / x86: Work around broken XSDT on Advantech DAC-BJ01 board Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 30/38] ACPI: battery: Add device HID and quirk for Microsoft Surface Go 3 Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 31/38] ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 32/38] crypto: qat - disable registration of algorithms Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 33/38] Revert "ath: add support for special 0x0 regulatory domain" Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 34/38] rcu: Dont deboost before reporting expedited quiescent state Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 35/38] mac80211: fix potential double free on mesh join Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 36/38] tpm: use try_get_ops() in tpm-space.c Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 37/38] wcn36xx: Differentiate wcn3660 from wcn3620 Greg Kroah-Hartman
2022-03-25 15:05 ` [PATCH 5.10 38/38] nds32: fix access_ok() checks in get/put_user Greg Kroah-Hartman
2022-03-25 18:38 ` [PATCH 5.10 00/38] 5.10.109-rc1 review Pavel Machek
2022-03-25 21:03 ` Fox Chen
2022-03-25 22:57 ` Florian Fainelli
2022-03-25 23:24 ` Shuah Khan
2022-03-26 7:05 ` Bagas Sanjaya
2022-03-26 13:15 ` Naresh Kamboju
2022-03-26 14:01 ` Sudip Mukherjee
2022-03-27 0:51 ` Guenter Roeck
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=20220325150419.944556173@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.ichikawa@cybertrust.co.jp \
--cc=mkoutny@suse.com \
--cc=stable@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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