| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <YWS5+uyDQ4qklTcT@bombadil.infradead.org>
Date: Mon, 11 Oct 2021 15:26:02 -0700
From: Luis Chamberlain <mcgrof@...nel.org>
To: Kees Cook <keescook@...omium.org>
Cc: tj@...nel.org, gregkh@...uxfoundation.org,
akpm@...ux-foundation.org, minchan@...nel.org, jeyu@...nel.org,
shuah@...nel.org, bvanassche@....org, dan.j.williams@...el.com,
joe@...ches.com, tglx@...utronix.de, rostedt@...dmis.org,
linux-spdx@...r.kernel.org, linux-doc@...r.kernel.org,
linux-block@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v8 09/12] sysfs: fix deadlock race with module removal
On Tue, Oct 05, 2021 at 01:50:31PM -0700, Kees Cook wrote:
> On Mon, Sep 27, 2021 at 09:38:02AM -0700, Luis Chamberlain wrote:
> > A sketch of how this can happen follows, consider foo a local mutex
> > part of a driver, and used on the driver's module exit routine and
> > on one of its sysfs ops:
> >
> > foo.c:
> > static DEFINE_MUTEX(foo);
> > static ssize_t foo_store(struct device *dev,
> > struct device_attribute *attr,
> > const char *buf, size_t count)
> > {
> > ...
> > mutex_lock(&foo);
> > ...
> > mutex_lock(&foo);
> > ...
> > }
> > static DEVICE_ATTR_RW(foo);
> > ...
> > void foo_exit(void)
> > {
> > mutex_lock(&foo);
> > ...
> > mutex_unlock(&foo);
> > }
> > module_exit(foo_exit);
> >
> > And this can lead to this condition:
> >
> > CPU A CPU B
> > foo_store()
> > foo_exit()
> > mutex_lock(&foo)
> > mutex_lock(&foo)
> > del_gendisk(some_struct->disk);
> > device_del()
> > device_remove_groups()
>
> Please expand this further, where does device_remove_groups() end up
> waiting for that never happens?
Sure. How about:
Furthermore, device_remove_groups() will just go on trying to remove
the sysfs files, which are kernfs entries. The way kernfs deals with
removal is that it will wait until all active references for the files
being removed are done. The active reference is obtained through
kernfs_get_active(). Removal ends up waiting through kernfs_drain()
for the active references to be done, and that only happens if the
kernfs file ops can complete. If these kernfs ops / sysfs files
are waiting for a mutex which taken by the module's exit routine
prior to trying to remove the sysfs files we deadlock.
> > In this situation foo_store() is waiting for the mutex foo to
> > become unlocked, but that won't happen until module removal is complete.
> > But module removal won't complete until the sysfs file being poked at
> > completes which is waiting for a lock already held.
> >
> > Signed-off-by: Luis Chamberlain <mcgrof@...nel.org>
> > ---
> > arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +-
> > fs/kernfs/dir.c | 44 ++++++++++++++++++----
> > fs/kernfs/file.c | 6 ++-
> > fs/kernfs/kernfs-internal.h | 3 +-
> > fs/kernfs/symlink.c | 3 +-
> > fs/sysfs/dir.c | 2 +-
> > fs/sysfs/file.c | 6 ++-
> > fs/sysfs/group.c | 3 +-
> > include/linux/kernfs.h | 14 ++++---
> > include/linux/sysfs.h | 52 ++++++++++++++++++++------
> > kernel/cgroup/cgroup.c | 2 +-
> > 11 files changed, 105 insertions(+), 34 deletions(-)
> >
> > diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> > index b57b3db9a6a7..4edf3b37fd2c 100644
> > --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> > +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> > @@ -209,7 +209,7 @@ static int rdtgroup_add_file(struct kernfs_node *parent_kn, struct rftype *rft)
> >
> > kn = __kernfs_create_file(parent_kn, rft->name, rft->mode,
> > GLOBAL_ROOT_UID, GLOBAL_ROOT_GID,
> > - 0, rft->kf_ops, rft, NULL, NULL);
> > + 0, rft->kf_ops, rft, NULL, NULL, NULL);
> > if (IS_ERR(kn))
> > return PTR_ERR(kn);
> >
> > @@ -2482,7 +2482,7 @@ static int mon_addfile(struct kernfs_node *parent_kn, const char *name,
> >
> > kn = __kernfs_create_file(parent_kn, name, 0444,
> > GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, 0,
> > - &kf_mondata_ops, priv, NULL, NULL);
> > + &kf_mondata_ops, priv, NULL, NULL, NULL);
> > if (IS_ERR(kn))
> > return PTR_ERR(kn);
> >
> > diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
> > index ba581429bf7b..e841201fd11b 100644
> > --- a/fs/kernfs/dir.c
> > +++ b/fs/kernfs/dir.c
> > @@ -14,6 +14,7 @@
> > #include <linux/slab.h>
> > #include <linux/security.h>
> > #include <linux/hash.h>
> > +#include <linux/module.h>
> >
> > #include "kernfs-internal.h"
> >
> > @@ -414,12 +415,29 @@ static bool kernfs_unlink_sibling(struct kernfs_node *kn)
> > */
> > struct kernfs_node *kernfs_get_active(struct kernfs_node *kn)
> > {
> > + int v;
> > +
> > if (unlikely(!kn))
> > return NULL;
> >
> > if (!atomic_inc_unless_negative(&kn->active))
> > return NULL;
> >
> > + /*
> > + * If a module created the kernfs_node, the module cannot possibly be
> > + * removed if the above atomic_inc_unless_negative() succeeded. So the
> > + * try_module_get() below is not to protect the lifetime of the module
> > + * as that is already guaranteed. The try_module_get() below is used
> > + * to ensure that we don't deadlock in case a kernfs operation and
> > + * module removal used a shared lock.
> > + */
> > + if (!try_module_get(kn->owner)) {
> > + v = atomic_dec_return(&kn->active);
> > + if (unlikely(v == KN_DEACTIVATED_BIAS))
> > + wake_up_all(&kernfs_root(kn)->deactivate_waitq);
> > + return NULL;
> > + }
>
> The special casing in here makes me think this isn't happening the right
> place. (i.e this looks like an open-coded version of kernfs_put_active())
No, well you see, in effect the special care taken in
kernfs_put_active() *is* the right way to inform a waiter that
that the *taken* reference right above *also* is no longer active.
The special casing here is because we took the active reference
before the try_module_get() in the above atomic_inc_unless_negative()
call. Outside callers deal with this through kernfs_put_active().
We are special casing to deal with the deadlock case.
> > +
> > if (kernfs_lockdep(kn))
> > rwsem_acquire_read(&kn->dep_map, 0, 1, _RET_IP_);
> > return kn;
> > @@ -442,6 +460,13 @@ void kernfs_put_active(struct kernfs_node *kn)
> > if (kernfs_lockdep(kn))
> > rwsem_release(&kn->dep_map, _RET_IP_);
> > v = atomic_dec_return(&kn->active);
> > +
> > + /*
> > + * We prevent module exit *until* we know for sure all possible
> > + * kernfs ops are done.
> > + */
> > + module_put(kn->owner);
> > +
> > if (likely(v != KN_DEACTIVATED_BIAS))
> > return;
>
> What I don't understand, however, is what kernfs_get/put_active() is
> intending to do -- it looks like it's trying to provide an interruption
> point for open kernfs file operations?
It is essentially ensuring that removal does not happen if any ops
are being used.
> This all seems extremely complex for what seems like it should just be a
> global "am I being removed?" bool?
It used to be worse :) And Tejun has cleaned this up over time. Yes,
perhaps we can improve that more but, given how sensible this code
is I think such improvements should be made separately.
> Regardless, while I do see the logic of associating the module get/put
> with get/put of kernfs "active", why is it not better tied to strictly
> kernfs open/close?
It's not just files, consider kernfs_iop_mkdir() which also calls
kernfs_get_active(). How about kernfs_fop_mmap()? And so, the common
denominator is actually kernfs_get_active().
> That would seem to be much simpler and not require
> any special handling?
Yes true, but it I think this would still leave open some other possible
deadlocks.
> For example, why does this not work?
It does for the write case for sure, but I haven't written tests for the
other odd cases, but suspect that would deadlock as well.
Luis
Powered by blists - more mailing lists