Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2649333pxj; Mon, 14 Jun 2021 04:02:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwW6tO7m39PdYlaa28haSYucWvaVELvTwevGze9pQ5UlccCW+GfXjOFaypkhqJryEDFUN6I X-Received: by 2002:aa7:d8d8:: with SMTP id k24mr16142144eds.253.1623668530593; Mon, 14 Jun 2021 04:02:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623668530; cv=none; d=google.com; s=arc-20160816; b=TCR6YsvBWG5B85dHtToeuJJxg8BinLg5g/EAkFIl+hEVir8iEC+70kf85G9aUYiii2 DJYzLNUNqTDpy/i9nWDZo7ukKZOHZb4i/4EJuw2xoeptr0maRNHMzF1SVRBH0k9SrP23 5LOhvpu6yxR25NIq1oxsrQiSIP+P07qX/U6/LPPwUTImApV3wZOVUI54SyJy4WG92nWZ kyyDzc37ihUaSKH+OiHdyfxuQQsVXgcQhM6Mzc1ZuxuffHEV7QDKi4mR410ipcXkeoEG MH+79dBYOm/lrYXrekIG/W3QV847Lx5kGJ4SnKonczS36gcrM35QK6YfkaI8vMIiGKjt dt/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3Fh/peryl8w47t3P09pbtGRMDg7Ojc6Ot5go5i/ashk=; b=mXye9yWUpaCFgha+SXn16Y+T4jC3F4RI2iI+/uY314LyQ5gjl+ds6gM1vLxENxRxK+ GTahk/uol9COE0zga2cotJlzOQXOm9LBT26t2/hjWw5EZNnppe3m/u3NEFN6zztAtPA1 SUDzFaYsk8IPFa+0sP4/k6Iy03Rw/qwiZJqNnsDBIeqixJkNEg3DKlzh0FEgfSy33dDX hM3Sjfe7WSmh43O37ciqcJjO3tFTihNTJEYsq1GJtn7TSHrXrRcPg8fKd9BwrWHrw2zy 0E3DMq0iiMha4xYpCSliI+BNMTMn4AOn7VjyDjiGrvGyb50Y+R2IlZkXBjL4CWLIgJ9j zxpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=t3pgKEAg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p25si11093722edx.114.2021.06.14.04.01.47; Mon, 14 Jun 2021 04:02:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=t3pgKEAg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235155AbhFNLAM (ORCPT + 99 others); Mon, 14 Jun 2021 07:00:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:59300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234424AbhFNKvf (ORCPT ); Mon, 14 Jun 2021 06:51:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 915F66146E; Mon, 14 Jun 2021 10:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667149; bh=cTOr5BKLFZnjZ6O2LC97hXpgWV48LVNwOUD4YxPtSDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t3pgKEAgqVnrn9KyQYsTs6FZAXaKNDaUBGzI8mEl4/f84FTT0yVCAaZW3e8rQyFtY jBPLmemdyssX16fYTKcwKgFBLaZNGKHMUZPedeh1GQGk4YIWoBzMwFd2DCX2M71SEB uIfpFeosm7tU1vDA8c60ipffNPJLAggQ9JnJlobw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Kuznetsov , Andrey Krasichkov , Dmitry Yakunin , Tejun Heo Subject: [PATCH 5.4 45/84] cgroup1: dont allow \n in renaming Date: Mon, 14 Jun 2021 12:27:23 +0200 Message-Id: <20210614102647.910673817@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102646.341387537@linuxfoundation.org> References: <20210614102646.341387537@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Kuznetsov commit b7e24eb1caa5f8da20d405d262dba67943aedc42 upstream. cgroup_mkdir() have restriction on newline usage in names: $ mkdir $'/sys/fs/cgroup/cpu/test\ntest2' mkdir: cannot create directory '/sys/fs/cgroup/cpu/test\ntest2': Invalid argument But in cgroup1_rename() such check is missed. This allows us to make /proc//cgroup unparsable: $ mkdir /sys/fs/cgroup/cpu/test $ mv /sys/fs/cgroup/cpu/test $'/sys/fs/cgroup/cpu/test\ntest2' $ echo $$ > $'/sys/fs/cgroup/cpu/test\ntest2' $ cat /proc/self/cgroup 11:pids:/ 10:freezer:/ 9:hugetlb:/ 8:cpuset:/ 7:blkio:/user.slice 6:memory:/user.slice 5:net_cls,net_prio:/ 4:perf_event:/ 3:devices:/user.slice 2:cpu,cpuacct:/test test2 1:name=systemd:/ 0::/ Signed-off-by: Alexander Kuznetsov Reported-by: Andrey Krasichkov Acked-by: Dmitry Yakunin Cc: stable@vger.kernel.org Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman --- kernel/cgroup/cgroup-v1.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -821,6 +821,10 @@ static int cgroup1_rename(struct kernfs_ struct cgroup *cgrp = kn->priv; int ret; + /* do not accept '\n' to prevent making /proc//cgroup unparsable */ + if (strchr(new_name_str, '\n')) + return -EINVAL; + if (kernfs_type(kn) != KERNFS_DIR) return -ENOTDIR; if (kn->parent != new_parent)