From: Yosry Ahmed <yosryahmed@google.com>
To: Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
Johannes Weiner <hannes@cmpxchg.org>, Yonghong Song <yhs@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>
Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, Yosry Ahmed <yosryahmed@google.com>,
"Christian A . Ehrhardt" <lk@c--e.de>
Subject: [PATCH v1 1/3] Revert "cgroup: enable cgroup_get_from_file() on cgroup1"
Date: Mon, 10 Oct 2022 23:58:43 +0000 [thread overview]
Message-ID: <20221010235845.3379019-2-yosryahmed@google.com> (raw)
In-Reply-To: <20221010235845.3379019-1-yosryahmed@google.com>
This reverts commit f3a2aebdd6fb90e444d595e46de64e822af419da.
Some callers of this function depended on the fact that it only supports
cgroup v2. Revert it now, and introduce a new function in a later patch
that supports both cgroup v1 and v2, for callers that need to support
both.
Reported-by: Christian A. Ehrhardt <lk@c--e.de>
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
kernel/cgroup/cgroup.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 764bdd5fd8d1..72e97422e9d9 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6218,6 +6218,11 @@ static struct cgroup *cgroup_get_from_file(struct file *f)
return ERR_CAST(css);
cgrp = css->cgroup;
+ if (!cgroup_on_dfl(cgrp)) {
+ cgroup_put(cgrp);
+ return ERR_PTR(-EBADF);
+ }
+
return cgrp;
}
--
2.38.0.rc1.362.ged0d419d3c-goog
next prev parent reply other threads:[~2022-10-10 23:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 23:58 [PATCH v1 0/3] Fix cgroup1 support in get from fd/file interfaces Yosry Ahmed
2022-10-10 23:58 ` Yosry Ahmed [this message]
2022-10-11 0:03 ` [PATCH v1 1/3] Revert "cgroup: enable cgroup_get_from_file() on cgroup1" Tejun Heo
[not found] ` <20221010235845.3379019-1-yosryahmed-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2022-10-10 23:58 ` [PATCH v1 2/3] cgroup: add cgroup_all_get_from_[fd/file]() Yosry Ahmed
2022-10-11 0:11 ` Tejun Heo
[not found] ` <Y0S0nFSyivpU4H0n-NiLfg/pYEd1N0TnZuCh8vA@public.gmane.org>
2022-10-11 0:14 ` Yosry Ahmed
2022-10-11 0:18 ` Tejun Heo
2022-10-11 1:43 ` kernel test robot
2022-10-11 6:47 ` kernel test robot
2022-10-10 23:58 ` [PATCH v1 3/3] bpf: cgroup_iter: support cgroup1 using cgroup fd Yosry Ahmed
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=20221010235845.3379019-2-yosryahmed@google.com \
--to=yosryahmed@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=hannes@cmpxchg.org \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan.x@bytedance.com \
--cc=lk@c--e.de \
--cc=martin.lau@linux.dev \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=tj@kernel.org \
--cc=yhs@fb.com \
/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