Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
References: <20220217161128.20291-1-mkoutny@suse.com>
In-Reply-To: <20220217161128.20291-1-mkoutny@suse.com>
From:   "Masami Ichikawa(CIP)" <masami.ichikawa@cybertrust.co.jp>
Date:   Fri, 18 Feb 2022 10:05:26 +0900
Message-ID: <CAODzB9qKWpQ5Rn4SwHUMa8xM6jfd-EuHPLyCPFHEbTFETM4Vvg@mail.gmail.com>
Subject: Re: [PATCH] cgroup-v1: Correct privileges check in release_agent writes
To:     =?UTF-8?Q?Michal_Koutn=C3=BD?= <mkoutny@suse.com>
Cc:     "Eric W. Biederman" <ebiederm@xmission.com>,
        Masami Ichikawa <masami.ichikawa@cybertrust.co.jp>,
        Tabitha Sable <tabitha.c.sable@gmail.com>,
        Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
        Johannes Weiner <hannes@cmpxchg.org>, stable@vger.kernel.org,
        cgroups@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TVVHT3dMNDIxdElCeUNUOVJYb1dhSjdhcDkrakNxRC9GWk9IN2ZWbThwTXJ4?=
 =?utf-8?B?YlF6WGVoNHVpMGhLYTRZR2pxRUJ6WDdXV2VwUS9PT2Q3bVRub09jMEUwdGNY?=
 =?utf-8?B?R0IyVXR5WXhoZlJTcmlnbGl4Nm5LbHJnNkc5TlB6Wkl2UWxEenpFaVVKaEo0?=
 =?utf-8?B?RVk4K3lLaWlrclp4czN4b0thMnI0VGNkTVQvVmdXSVcybjRZcEo4ZnhTdXA1?=
 =?utf-8?B?cjlyMVYvcml1K0NFZFgxSEpKYURkdnZoL0NLM0RHNnkrK1hDYy9qNHBBV0dO?=
 =?utf-8?B?eG5XTjBnSURZY2FLOE9EaW5WalBGQUxTTWtycWtneWs4ZmIrNzh0VERibmUy?=
 =?utf-8?B?WVJkUmlvbHpsOXlZTXFJYWlFOG5TVld6ZGtZYmU4YTRuTFhmWVBjSHVsb1NR?=
 =?utf-8?B?bGg2K0Q2dGpBelQyd0UyT1N3anNnTTZmQ2NNOFk5WlE3bENTeHhOVCtCYkE5?=
 =?utf-8?B?b0Q0ZE8xMWhSNzhqRWNBd0E5elBYV2YvRDRoeFB4Tmd6TW96TnFpbnpRNWN3?=
 =?utf-8?B?bldzcjJYenBYWVZyb1VObkNRUG4rRjVCRE13VHlTQ0ZpeEw0K3ZnWE9PVXhu?=
 =?utf-8?B?UXJrb1BpN2EveGxyL2ExOEtXUkxxVkpoRFFsQU9HY0RqL2E1VFBMZTJId0hB?=
 =?utf-8?B?cGFTWG5sUXFvbFkzWmhPbDNXOExKelBweHRzNVdwWVdqWWhid0N3NE9jcnRS?=
 =?utf-8?B?ZjRhZ0Z0ZmlhL2ZpajJaMFZQa04wNDAwVHE3enFZVlRhNHcwblZWeUpKTUxo?=
 =?utf-8?B?NFB5NG5NR3oyRXA2dlk0SXNiRk56bXQ5SlRLYTZPMzdwdWs5dWpDc2ZxTVQr?=
 =?utf-8?B?Sk40N29qUmtIb3poOGlRSEJSYkw4ZWRha1NxZkhPemdoTGJjb09uWFJqZ0k2?=
 =?utf-8?B?UGV5clJ4NEczbHFYY1c2cmpyY2tMNWtNVmpSRnFIMms1L1hqanlIenM3Zkcy?=
 =?utf-8?B?V1hlMHl6SFlacXJ4a2pibWJwcGZ3dWRaTFBsNXlSR3VnMUVveFdKTDJYV0l5?=
 =?utf-8?B?cHNsbHhRTXlnNzg4dHBDbzhXL0tyejJQbEF1bFdRdjF2VEE3S3paQzBlNTNL?=
 =?utf-8?B?VU94TkRmd1JkR0hLaSs5LzlRSGhEb1Z1ZmhEMEcxMFI0ZExiT1BtRnFsQWU1?=
 =?utf-8?B?a3hwL0k0R3dUaVgvaG8yOGNvdE16NXJzTWZNTUx3T3ZZUjRkTnRVZWlaT05O?=
 =?utf-8?B?dldzdnRyR2pOeE5EZU9yeW5yUG01N1dhQzkwU003NHI3UmZGcXBmNHAzUFZz?=
 =?utf-8?B?ZGhKU2Z4TkloZURCYW9WVURGdUhubXFwVTdzT0Z5SnJuVFAzSzRsMXcxcnFC?=
 =?utf-8?B?bUlabEFNSElSeWZ3TVpYSHZNaWlmWGRCMVhtelQ4U2U0ZnBiR0d5cUlhaG5M?=
 =?utf-8?B?L3RpV3hicGFTTUxGODFBVUphQmMyRjJQYkM4WmVpWXh6QnhsNVdOZ09pd2tZ?=
 =?utf-8?B?YU4xR28xaWRTUHV3UmZJRlJpQmNwQzRxeXJGeENJSk1hdXBOU3hBZFB4WFdR?=
 =?utf-8?B?T0NqTlpzdlllOFJ1V3VldGlnRjJjbGFtdjN3eXBiTkt4Mmp6S0g0SVhpV0ha?=
 =?utf-8?B?QkxFeXFjUVNsdlQ5WmdpZE5RaFlLS2tCQTVienRFT2RsRXovQllIQzFmZjFn?=
 =?utf-8?B?cjJDaGZrNnNrVjVTZlpuS3lCZ0JnQ25NWHh0Q0NPa1o0ekZlOHdSUDI0Y01Z?=
 =?utf-8?B?Q3ZhOHVjZnN2T0I0YkJkUkV3b1lWMDRNSUJ1bkVIS0FkQ0dsQkpNeXRYVy9X?=
 =?utf-8?B?L1lnNTduWGtOclhGcXE4cWJReEMyaVFnSG5BRkpzNzJsZkMwT0hzWlBBN25l?=
 =?utf-8?B?cndYZHN0YVdGMlgxRkhTN0lVZWY5Tmg2TEozRTBnY1AyS1NtZjcvZ3Roc3dT?=
 =?utf-8?B?L3VjanA0akFzS3hESGM1RU9YQzZScFRsczNDSjFZY1A0YnM4OVNYQmphS0ls?=
 =?utf-8?B?R1NnZ3A0VHZpN2w1VENFcjRGRlpSS1YzYlBSbFJYY2t5ZWpnLy9TNG1FQXlo?=
 =?utf-8?B?R0pJWUVHbG8wQnIyWlpJcmw1bHMyTG9IdXF5TWszdzhsZmJBZERMTXRzeXpi?=
 =?utf-8?B?QjJZakZnTENpYjZ4QTE4cXd1RmZNYzdXekRBL0ZSRVVscW91QmZCUzBFV0Zv?=
 =?utf-8?B?ckJFU1ZSSmVmQ1BtajFpSGcvdWNQa0M5RU1lVjRQNWZSbjh2QXZVRmJoc0FF?=
 =?utf-8?B?YzBSUTFLaUlGN3gzdTRpbFMwL3h1ajRnN2VVOFZ5R3BRcDR2TmZDLzdyeHRr?=
 =?utf-8?B?T09RT0Z6TmIzL0tpUlBTM0htWE0xdEZiTUg3RmRWSHV6UWVLWFc4K2FCN2dT?=
 =?utf-8?B?WTliZGg1cHczWGtnSCtzQzFjSXh2bzJvSkVoZzhBRDNrUHhkN1JUUT09?=
X-OriginatorOrg: cybertrust.co.jp
X-MS-Exchange-CrossTenant-Network-Message-Id: 929d364c-b1aa-462b-f316-08d9f279e11d
X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB3882.jpnprd01.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2022 00:59:13.2530
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 72cc4624-32b4-4dab-b80a-8563e559bd82
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: WavuJHUNmz/ljSig98bxh7HJk80aaw1CencmPMczagikgqQGhJZXa6nXyL1AG0Ojw2PREAjQabKupFaYIICB8QbUZwz7j89/ppkVxh+CVWNtO63ycC5caofznRpU54NX
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB2229
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Feb 18, 2022 at 1:11 AM Michal Koutný <mkoutny@suse.com> wrote:
>
> 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>
> ---
>  kernel/cgroup/cgroup-v1.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
> index 0e877dbcfeea..afc6c0e9c966 100644
> --- a/kernel/cgroup/cgroup-v1.c
> +++ b/kernel/cgroup/cgroup-v1.c
> @@ -546,6 +546,7 @@ static ssize_t cgroup_release_agent_write(struct kernfs_open_file *of,
>                                           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);
>
> @@ -553,8 +554,9 @@ static ssize_t cgroup_release_agent_write(struct kernfs_open_file *of,
>          * 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);
> --
> 2.34.1

Thank you. Looks good to me.

Reviewed-by: Masami Ichikawa(CIP) <masami.ichikawa@cybertrust.co.jp>