From: Serge Hallyn <serge.hallyn@canonical.com>
To: Aristeu Rozanski <aris@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>, Li Zefan <lizefan@huawei.com>,
James Morris <jmorris@namei.org>,
Pavel Emelyanov <xemul@openvz.org>, Jiri Slaby <jslaby@suse.cz>,
cgroups@vger.kernel.org
Subject: Re: [PATCH] device_cgroup: fix unchecked cgroup parent usage
Date: Wed, 31 Oct 2012 18:21:01 +0100 [thread overview]
Message-ID: <20121031172101.GC20848@serge-ThinkPad-X130e> (raw)
In-Reply-To: <20121031160430.GD14789@redhat.com>
Quoting Aristeu Rozanski (aris@redhat.com):
> In 4cef7299b4786879a3e113e84084a72b24590c5b the cgroup parent usage is
> unchecked. root will not have a parent and trying to use
> device.{allow,deny} will cause problems. For some reason my stressing
> scripts didn't test the root directory so I didn't catch it on my
> regular tests.
>
> Andrew, Tejun, this patch needs to make Linus tree ASAP or a revert for
> 4cef7299b4786879a3e113e84084a72b24590c5b.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Li Zefan <lizefan@huawei.com>
> Cc: James Morris <jmorris@namei.org>
> Cc: Pavel Emelyanov <xemul@openvz.org>
> Cc: Serge Hallyn <serge.hallyn@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
> Cc: Jiri Slaby <jslaby@suse.cz>
> Signed-off-by: Aristeu Rozanski <aris@redhat.com>
>
> --- github.orig/security/device_cgroup.c 2012-10-26 17:18:01.739366780 -0400
> +++ github/security/device_cgroup.c 2012-10-29 10:03:33.221918003 -0400
> @@ -352,6 +352,8 @@
> */
> static inline int may_allow_all(struct dev_cgroup *parent)
> {
> + if (!parent)
> + return 1;
> return parent->behavior == DEVCG_DEFAULT_ALLOW;
> }
>
> @@ -376,11 +378,14 @@
> int count, rc;
> struct dev_exception_item ex;
> struct cgroup *p = devcgroup->css.cgroup;
> - struct dev_cgroup *parent = cgroup_to_devcgroup(p->parent);
> + struct dev_cgroup *parent = NULL;
>
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
>
> + if (p->parent)
> + parent = cgroup_to_devcgroup(p->parent);
> +
> memset(&ex, 0, sizeof(ex));
> b = buffer;
>
> @@ -391,11 +396,14 @@
> if (!may_allow_all(parent))
> return -EPERM;
> dev_exception_clean(devcgroup);
> + devcgroup->behavior = DEVCG_DEFAULT_ALLOW;
> + if (!parent)
> + break;
> +
> rc = dev_exceptions_copy(&devcgroup->exceptions,
> &parent->exceptions);
> if (rc)
> return rc;
> - devcgroup->behavior = DEVCG_DEFAULT_ALLOW;
> break;
> case DEVCG_DENY:
> dev_exception_clean(devcgroup);
next prev parent reply other threads:[~2012-10-31 17:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 16:04 [PATCH] device_cgroup: fix unchecked cgroup parent usage Aristeu Rozanski
2012-10-31 16:23 ` Tejun Heo
2012-10-31 17:21 ` Serge Hallyn [this message]
2012-10-31 23:35 ` Andrew Morton
2012-11-01 13:28 ` Aristeu Rozanski
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=20121031172101.GC20848@serge-ThinkPad-X130e \
--to=serge.hallyn@canonical.com \
--cc=akpm@linux-foundation.org \
--cc=aris@redhat.com \
--cc=cgroups@vger.kernel.org \
--cc=jmorris@namei.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=tj@kernel.org \
--cc=xemul@openvz.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