From: Christian Brauner <christian.brauner@ubuntu.com>
To: Will Deacon <will@kernel.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org, bsingharora@gmail.com,
dvyukov@google.com, elver@google.com, parri.andrea@gmail.com,
stable@vger.kernel.org,
syzbot+c5d03165a1bd1dead0c1@syzkaller.appspotmail.com,
syzkaller-bugs@googlegroups.com
Subject: Re: [PATCH v6] taskstats: fix data-race
Date: Sat, 30 Nov 2019 16:08:53 +0100 [thread overview]
Message-ID: <20191130150851.r6lgwwatu42ad6i4@wittgenstein> (raw)
In-Reply-To: <20191129175604.GA29789@willie-the-truck>
On Fri, Nov 29, 2019 at 05:56:05PM +0000, Will Deacon wrote:
> On Mon, Oct 21, 2019 at 03:04:18PM +0200, Christian Brauner wrote:
> > On Mon, Oct 21, 2019 at 02:19:01PM +0200, Rasmus Villemoes wrote:
> > > On 21/10/2019 13.33, Christian Brauner wrote:
> > > > The first approach used smp_load_acquire() and smp_store_release().
> > > > However, after having discussed this it seems that the data dependency
> > > > for kmem_cache_alloc() would be fixed by WRITE_ONCE().
> > > > Furthermore, the smp_load_acquire() would only manage to order the stats
> > > > check before the thread_group_empty() check. So it seems just using
> > > > READ_ONCE() and WRITE_ONCE() will do the job and I wanted to bring this
> > > > up for discussion at least.
> > > >
> > > > /* v6 */
> > > > - Christian Brauner <christian.brauner@ubuntu.com>:
> > > > - bring up READ_ONCE()/WRITE_ONCE() approach for discussion
> > > > ---
> > > > kernel/taskstats.c | 26 +++++++++++++++-----------
> > > > 1 file changed, 15 insertions(+), 11 deletions(-)
> > > >
> > > > diff --git a/kernel/taskstats.c b/kernel/taskstats.c
> > > > index 13a0f2e6ebc2..111bb4139aa2 100644
> > > > --- a/kernel/taskstats.c
> > > > +++ b/kernel/taskstats.c
> > > > @@ -554,25 +554,29 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
> > > > static struct taskstats *taskstats_tgid_alloc(struct task_struct *tsk)
> > > > {
> > > > struct signal_struct *sig = tsk->signal;
> > > > - struct taskstats *stats;
> > > > + struct taskstats *stats_new, *stats;
> > > >
> > > > - if (sig->stats || thread_group_empty(tsk))
> > > > - goto ret;
> > > > + /* Pairs with WRITE_ONCE() below. */
> > > > + stats = READ_ONCE(sig->stats);
> > > > + if (stats || thread_group_empty(tsk))
> > > > + return stats;
> > > >
> > > > /* No problem if kmem_cache_zalloc() fails */
> > > > - stats = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
> > > > + stats_new = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
> > > >
> > > > spin_lock_irq(&tsk->sighand->siglock);
> > > > - if (!sig->stats) {
> > > > - sig->stats = stats;
> > > > - stats = NULL;
> > > > + if (!stats) {
> > > > + stats = stats_new;
> > > > + /* Pairs with READ_ONCE() above. */
> > > > + WRITE_ONCE(sig->stats, stats_new);
> > > > + stats_new = NULL;
> > >
> > > No idea about the memory ordering issues, but don't you need to
> > > load/check sig->stats again? Otherwise it seems that two threads might
> > > both see !sig->stats, both allocate a stats_new, and both
> > > unconditionally in turn assign their stats_new to sig->stats. Then the
> > > first assignment ends up becoming a memory leak (and any writes through
> > > that pointer done by the caller end up in /dev/null...)
> >
> > Trigger hand too fast. I guess you're thinking sm like:
> >
> > diff --git a/kernel/taskstats.c b/kernel/taskstats.c
> > index 13a0f2e6ebc2..c4e1ed11e785 100644
> > --- a/kernel/taskstats.c
> > +++ b/kernel/taskstats.c
> > @@ -554,25 +554,27 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
> > static struct taskstats *taskstats_tgid_alloc(struct task_struct *tsk)
> > {
> > struct signal_struct *sig = tsk->signal;
> > - struct taskstats *stats;
> > + struct taskstats *stats_new, *stats;
> >
> > - if (sig->stats || thread_group_empty(tsk))
> > - goto ret;
> > + stats = READ_ONCE(sig->stats);
>
> This probably wants to be an acquire, since both the memcpy() later on
> in taskstats_exit() and the accesses in {b,x}acct_add_tsk() appear to
> read from the taskstats structure without the sighand->siglock held and
> therefore may miss zeroed allocation from the zalloc() below, I think.
>
> > + if (stats || thread_group_empty(tsk))
> > + return stats;
> >
> > - /* No problem if kmem_cache_zalloc() fails */
> > - stats = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
> > + stats_new = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
> >
> > spin_lock_irq(&tsk->sighand->siglock);
> > - if (!sig->stats) {
> > - sig->stats = stats;
> > - stats = NULL;
> > + stats = READ_ONCE(sig->stats);
>
> You hold the spinlock here, so I don't think you need the READ_ONCE().
>
> > + if (!stats) {
> > + stats = stats_new;
> > + WRITE_ONCE(sig->stats, stats_new);
>
> You probably want a release here to publish the zeroes from the zalloc()
> (back to my first comment). With those changes:
>
> Reviewed-by: Will Deacon <will@kernel.org>
Thanks, this is basically what we had in v5. I'll rework and send this
after the merge window closes.
>
> However, this caused me to look at do_group_exit() and we appear to have
> racy accesses on sig->flags there thanks to signal_group_exit(). I worry
> that might run quite deep, and can probably be looked at separately.
Yeah, we should look into this but separate from this patch.
Thanks for taking a look at this! Much appreciated!
Christian
next prev parent reply other threads:[~2019-11-30 15:09 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-05 4:26 KCSAN: data-race in taskstats_exit / taskstats_exit syzbot
2019-10-05 4:29 ` Dmitry Vyukov
2019-10-05 11:29 ` Christian Brauner
2019-10-05 11:28 ` [PATCH] taskstats: fix data-race Christian Brauner
2019-10-05 13:33 ` Marco Elver
2019-10-05 14:15 ` Christian Brauner
2019-10-05 14:34 ` Marco Elver
2019-10-06 10:00 ` Dmitry Vyukov
2019-10-06 10:59 ` Christian Brauner
2019-10-06 23:52 ` Christian Brauner
2019-10-07 7:31 ` Dmitry Vyukov
2019-10-07 9:29 ` Christian Brauner
2019-10-07 10:40 ` Andrea Parri
2019-10-07 10:50 ` Christian Brauner
2019-10-07 11:01 ` [PATCH v2] " Christian Brauner
2019-10-07 13:18 ` Andrea Parri
2019-10-07 13:28 ` Christian Brauner
2019-10-07 13:50 ` Dmitry Vyukov
2019-10-07 13:55 ` Christian Brauner
2019-10-07 14:08 ` Dmitry Vyukov
2019-10-07 14:10 ` Christian Brauner
2019-10-07 14:14 ` Andrea Parri
2019-10-07 14:18 ` Dmitry Vyukov
2019-10-08 14:20 ` Andrea Parri
2019-10-08 14:24 ` Christian Brauner
2019-10-08 15:26 ` Andrea Parri
2019-10-08 15:35 ` Christian Brauner
2019-10-08 15:44 ` Andrea Parri
2019-10-09 11:31 ` [PATCH] " Christian Brauner
2019-10-09 11:40 ` Christian Brauner
2019-10-09 11:48 ` [PATCH v5] " Christian Brauner
2019-10-09 12:08 ` Andrea Parri
2019-10-09 13:26 ` Christian Brauner
2019-10-21 11:33 ` [PATCH v6] " Christian Brauner
2019-10-21 12:19 ` Rasmus Villemoes
2019-10-21 13:04 ` Christian Brauner
2019-11-29 17:56 ` Will Deacon
2019-11-30 15:08 ` Christian Brauner [this message]
2019-10-23 12:16 ` Andrea Parri
2019-10-23 12:39 ` Dmitry Vyukov
2019-10-23 13:11 ` Christian Brauner
2019-10-23 13:20 ` Dmitry Vyukov
2019-10-24 11:31 ` Andrea Parri
2019-10-24 11:51 ` Dmitry Vyukov
2019-10-24 13:05 ` Andrea Parri
2019-10-24 13:13 ` Dmitry Vyukov
2019-10-24 13:21 ` Christian Brauner
2019-10-24 13:34 ` Dmitry Vyukov
2019-10-24 13:43 ` Andrea Parri
2019-10-24 13:58 ` Dmitry Vyukov
2019-10-24 14:40 ` Andrea Parri
2019-10-24 14:49 ` Dmitry Vyukov
2019-11-29 17:57 ` Will Deacon
2019-10-09 11:48 ` [PATCH] " Marco Elver
2019-10-09 11:53 ` Christian Brauner
2019-11-06 0:27 ` Balbir Singh
2019-11-06 0:09 ` KCSAN: data-race in taskstats_exit / taskstats_exit Balbir Singh
2019-11-06 10:23 ` Marco Elver
2019-11-07 10:39 ` Balbir Singh
2019-11-08 0:54 ` Balbir Singh
2019-11-08 8:55 ` Dmitry Vyukov
2019-11-09 3:42 ` Balbir Singh
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=20191130150851.r6lgwwatu42ad6i4@wittgenstein \
--to=christian.brauner@ubuntu.com \
--cc=bsingharora@gmail.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=parri.andrea@gmail.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+c5d03165a1bd1dead0c1@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=will@kernel.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;
as well as URLs for NNTP newsgroup(s).