[PATCH 1/1] devices cgroup: allow mkfifo

[PATCH 1/1] devices cgroup: allow mkfifo

[Serge E. Hallyn]

The devcgroup_inode_permission() hook in the devices whitelist
cgroup has always bypassed access checks on fifos.  But the
mknod hook did not.  The devices whitelist is only about block
and char devices, and fifos can't even be added to the whitelist,
so fifos can't be created at all except by tasks which have 'a'
in their whitelist (meaning they have access to all devices).

Fix the behavior by bypassing access checks to mkfifo.

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 security/device_cgroup.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 5ba7870..df9d491 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
 	struct dev_cgroup *dev_cgroup;
 	struct dev_whitelist_item *wh;
 
+	if (!S_ISBLK(mode) && !S_ISCHR(mode))
+		return 0;
+
 	rcu_read_lock();
 
 	dev_cgroup = task_devcgroup(current);
-- 
1.5.4.3

Re: [PATCH 1/1] devices cgroup: allow mkfifo

[Daniel Lezcano]

Serge E. Hallyn wrote:
> The devcgroup_inode_permission() hook in the devices whitelist
> cgroup has always bypassed access checks on fifos.  But the
> mknod hook did not.  The devices whitelist is only about block
> and char devices, and fifos can't even be added to the whitelist,
> so fifos can't be created at all except by tasks which have 'a'
> in their whitelist (meaning they have access to all devices).
> 
> Fix the behavior by bypassing access checks to mkfifo.
> 
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  security/device_cgroup.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> index 5ba7870..df9d491 100644
> --- a/security/device_cgroup.c
> +++ b/security/device_cgroup.c
> @@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
>  	struct dev_cgroup *dev_cgroup;
>  	struct dev_whitelist_item *wh;
> 
> +	if (!S_ISBLK(mode) && !S_ISCHR(mode))
> +		return 0;
> +
>  	rcu_read_lock();
> 
>  	dev_cgroup = task_devcgroup(current);

Cool thanks. I am able to create the initctl fifo now.

  -- Daniel

[PATCH 1/1] devices cgroup: allow mkfifo

[Serge E. Hallyn]

The devcgroup_inode_permission() hook in the devices whitelist
cgroup has always bypassed access checks on fifos.  But the
mknod hook did not.  The devices whitelist is only about block
and char devices, and fifos can't even be added to the whitelist,
so fifos can't be created at all except by tasks which have 'a'
in their whitelist (meaning they have access to all devices).

Fix the behavior by bypassing access checks to mkfifo.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
---
 security/device_cgroup.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 5ba7870..df9d491 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
 	struct dev_cgroup *dev_cgroup;
 	struct dev_whitelist_item *wh;
 
+	if (!S_ISBLK(mode) && !S_ISCHR(mode))
+		return 0;
+
 	rcu_read_lock();
 
 	dev_cgroup = task_devcgroup(current);
-- 
1.5.4.3

Re: [PATCH 1/1] devices cgroup: allow mkfifo

[Li Zefan]

CC: Andrew

Serge E. Hallyn wrote:
> The devcgroup_inode_permission() hook in the devices whitelist
> cgroup has always bypassed access checks on fifos.  But the
> mknod hook did not.  The devices whitelist is only about block
> and char devices, and fifos can't even be added to the whitelist,
> so fifos can't be created at all except by tasks which have 'a'
> in their whitelist (meaning they have access to all devices).
> 
> Fix the behavior by bypassing access checks to mkfifo.
> 

It also bypasses checks to mksock. Should backport this patch?

Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>

> Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
> ---
>  security/device_cgroup.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> index 5ba7870..df9d491 100644
> --- a/security/device_cgroup.c
> +++ b/security/device_cgroup.c
> @@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
>  	struct dev_cgroup *dev_cgroup;
>  	struct dev_whitelist_item *wh;
>  
> +	if (!S_ISBLK(mode) && !S_ISCHR(mode))
> +		return 0;
> +
>  	rcu_read_lock();
>  
>  	dev_cgroup = task_devcgroup(current);

Re: [PATCH 1/1] devices cgroup: allow mkfifo

[Serge E. Hallyn]

Quoting Li Zefan (lizf@cn.fujitsu.com):
> CC: Andrew
> 
> Serge E. Hallyn wrote:
> > The devcgroup_inode_permission() hook in the devices whitelist
> > cgroup has always bypassed access checks on fifos.  But the
> > mknod hook did not.  The devices whitelist is only about block
> > and char devices, and fifos can't even be added to the whitelist,
> > so fifos can't be created at all except by tasks which have 'a'
> > in their whitelist (meaning they have access to all devices).
> > 
> > Fix the behavior by bypassing access checks to mkfifo.
> > 
> 
> It also bypasses checks to mksock. Should backport this patch?

Do you mean push it into -stable?

Couldn't hurt, but it's a DOS to root in a container, not a security
vulnerability, and since noone has complainted until now so at least
it's not panick-worthy.

> Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>

Thanks.  I'll go ahead and send to Linus and -stable.

-serge

> > Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
> > ---
> >  security/device_cgroup.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> > index 5ba7870..df9d491 100644
> > --- a/security/device_cgroup.c
> > +++ b/security/device_cgroup.c
> > @@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
> >  	struct dev_cgroup *dev_cgroup;
> >  	struct dev_whitelist_item *wh;
> >  
> > +	if (!S_ISBLK(mode) && !S_ISCHR(mode))
> > +		return 0;
> > +
> >  	rcu_read_lock();
> >  
> >  	dev_cgroup = task_devcgroup(current);

[PATCH 1/1] devices cgroup: allow mkfifo

[Serge E. Hallyn]

The devcgroup_inode_permission() hook in the devices whitelist
cgroup has always bypassed access checks on fifos.  But the
mknod hook did not.  The devices whitelist is only about block
and char devices, and fifos can't even be added to the whitelist,
so fifos can't be created at all except by tasks which have 'a'
in their whitelist (meaning they have access to all devices).

Fix the behavior by bypassing access checks to mkfifo (and mksock).

(Thanks, Daniel, for finding this)

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
---
 security/device_cgroup.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 5ba7870..df9d491 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
 	struct dev_cgroup *dev_cgroup;
 	struct dev_whitelist_item *wh;
 
+	if (!S_ISBLK(mode) && !S_ISCHR(mode))
+		return 0;
+
 	rcu_read_lock();
 
 	dev_cgroup = task_devcgroup(current);
-- 
1.5.4.3

Re: [PATCH 1/1] devices cgroup: allow mkfifo

[Andrew Morton]

On Thu, 11 Dec 2008 09:50:27 -0600 "Serge E. Hallyn" <serue@us.ibm.com> wrote:

> The devcgroup_inode_permission() hook in the devices whitelist
> cgroup has always bypassed access checks on fifos.  But the
> mknod hook did not.  The devices whitelist is only about block
> and char devices, and fifos can't even be added to the whitelist,
> so fifos can't be created at all except by tasks which have 'a'
> in their whitelist (meaning they have access to all devices).
> 
> Fix the behavior by bypassing access checks to mkfifo (and mksock).
> 
> (Thanks, Daniel, for finding this)
> 
> Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
> Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
>  security/device_cgroup.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> index 5ba7870..df9d491 100644
> --- a/security/device_cgroup.c
> +++ b/security/device_cgroup.c
> @@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
>  	struct dev_cgroup *dev_cgroup;
>  	struct dev_whitelist_item *wh;
>  
> +	if (!S_ISBLK(mode) && !S_ISCHR(mode))
> +		return 0;
> +
>  	rcu_read_lock();
>  
>  	dev_cgroup = task_devcgroup(current);

hm.  I'd looked at your description and decided this was 2.6.29 material.

But you think it's for 2.6.28 and even for 2.6.27.  How come?

(iow, your changelog sucked :)

Re: [PATCH 1/1] devices cgroup: allow mkfifo

[Serge E. Hallyn]

Quoting Andrew Morton (akpm@linux-foundation.org):
> On Thu, 11 Dec 2008 09:50:27 -0600 "Serge E. Hallyn" <serue@us.ibm.com> wrote:
> 
> > The devcgroup_inode_permission() hook in the devices whitelist
> > cgroup has always bypassed access checks on fifos.  But the
> > mknod hook did not.  The devices whitelist is only about block
> > and char devices, and fifos can't even be added to the whitelist,
> > so fifos can't be created at all except by tasks which have 'a'
> > in their whitelist (meaning they have access to all devices).
> > 
> > Fix the behavior by bypassing access checks to mkfifo (and mksock).
> > 
> > (Thanks, Daniel, for finding this)
> > 
> > Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
> > Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
> > ---
> >  security/device_cgroup.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> > index 5ba7870..df9d491 100644
> > --- a/security/device_cgroup.c
> > +++ b/security/device_cgroup.c
> > @@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
> >  	struct dev_cgroup *dev_cgroup;
> >  	struct dev_whitelist_item *wh;
> >  
> > +	if (!S_ISBLK(mode) && !S_ISCHR(mode))
> > +		return 0;
> > +
> >  	rcu_read_lock();
> >  
> >  	dev_cgroup = task_devcgroup(current);
> 
> hm.  I'd looked at your description and decided this was 2.6.29 material.
> 
> But you think it's for 2.6.28 and even for 2.6.27.  How come?
> 
> (iow, your changelog sucked :)

Sorry, I should have put the exchange between Li and I in there.
(Ouch, and I didn't cc: Li this time!  Sorry, Li.)

Li thought it was 2.6.27/2.6.27 material.  I thought not, but wanted
to see what the -stable folks thought.

This is not a security hole, and since noone has complained before
it doesn't appear to be too inconvenient.  Until the fix goes
up, container users can always create the fifos and socks on the
root image while creating the container, before entering the
device whitelist.

thanks,
-serge

Re: [PATCH 1/1] devices cgroup: allow mkfifo

[Li Zefan]

>> hm.  I'd looked at your description and decided this was 2.6.29 material.
>>
>> But you think it's for 2.6.28 and even for 2.6.27.  How come?
>>
>> (iow, your changelog sucked :)
> 
> Sorry, I should have put the exchange between Li and I in there.
> (Ouch, and I didn't cc: Li this time!  Sorry, Li.)
> 
> Li thought it was 2.6.27/2.6.27 material.  I thought not, but wanted
> to see what the -stable folks thought.
> 

I was not sure about this.

> This is not a security hole, and since noone has complained before
> it doesn't appear to be too inconvenient.  Until the fix goes
> up, container users can always create the fifos and socks on the
> root image while creating the container, before entering the
> device whitelist.
> 

Now the explanation makes it clear for me, thx. :)