From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: David Howells <dhowells@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, vdavydov.dev@gmail.com,
mhocko@suse.com, aryabinin@virtuozzo.com, ying.huang@intel.com,
penguin-kernel@I-love.SAKURA.ne.jp, willy@infradead.org,
shakeelb@google.com, jbacik@fb.com, linux-mm@kvack.org
Subject: Re: [PATCH] mm: Move check for SHRINKER_NUMA_AWARE to do_shrink_slab()
Date: Fri, 3 Aug 2018 14:04:42 +0300 [thread overview]
Message-ID: <190b28da-aca8-1c72-0933-94de08a48019@virtuozzo.com> (raw)
In-Reply-To: <5250d5c0-0d26-260e-dc39-227b8e355a1b@virtuozzo.com>
On 03.08.2018 13:59, Kirill Tkhai wrote:
> On 03.08.2018 13:31, David Howells wrote:
>> The reproducer can be reduced to:
>>
>> #define _GNU_SOURCE
>> #include <endian.h>
>> #include <stdint.h>
>> #include <string.h>
>> #include <stdio.h>
>> #include <sys/syscall.h>
>> #include <sys/stat.h>
>> #include <sys/mount.h>
>> #include <unistd.h>
>> #include <fcntl.h>
>>
>> const char path[] = "./file0";
>>
>> int main()
>> {
>> mkdir(path, 0);
>> mount(path, path, "cgroup2", 0, 0);
>> chroot(path);
>> umount2(path, 0);
>> return 0;
>> }
>>
>> and I've found two bugs (see attached patch). The issue is that
>> do_remount_sb() is called with fc == NULL from umount(), but both
>> cgroup_reconfigure() and do_remount_sb() dereference fc unconditionally.
>>
>> But! I'm not sure why the reproducer works at all because the umount2() call
>> is *after* the chroot, so should fail on ENOENT before it even gets that far.
>> In fact, umount2() can be called multiple times, apparently successfully, and
>> doesn't actually unmount anything.
>
> Before I also try to check why it works; just reporting you that the patch
> works the problem in my environment. Thanks, David.
patch *fixes* the problem
>
>> ---
>> diff --git a/fs/super.c b/fs/super.c
>> index 3fe5d12b7697..321fbc244570 100644
>> --- a/fs/super.c
>> +++ b/fs/super.c
>> @@ -978,7 +978,10 @@ int do_remount_sb(struct super_block *sb, int sb_flags, void *data,
>> sb->s_op->remount_fs) {
>> if (sb->s_op->reconfigure) {
>> retval = sb->s_op->reconfigure(sb, fc);
>> - sb_flags = fc->sb_flags;
>> + if (fc)
>> + sb_flags = fc->sb_flags;
>> + else
>> + sb_flags = sb->s_flags;
>> if (retval == 0)
>> security_sb_reconfigure(fc);
>> } else {
>> diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
>> index f3238f38d152..48275fdce053 100644
>> --- a/kernel/cgroup/cgroup.c
>> +++ b/kernel/cgroup/cgroup.c
>> @@ -1796,9 +1796,11 @@ static void apply_cgroup_root_flags(unsigned int root_flags)
>>
>> static int cgroup_reconfigure(struct kernfs_root *kf_root, struct fs_context *fc)
>> {
>> - struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
>> + if (fc) {
>> + struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
>>
>> - apply_cgroup_root_flags(ctx->flags);
>> + apply_cgroup_root_flags(ctx->flags);
>> + }
>> return 0;
>> }
>>
>>
next prev parent reply other threads:[~2018-08-03 11:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 11:00 [PATCH] mm: Move check for SHRINKER_NUMA_AWARE to do_shrink_slab() Kirill Tkhai
2018-08-02 16:47 ` Yang Shi
2018-08-02 16:54 ` Shakeel Butt
2018-08-02 17:26 ` Yang Shi
2018-08-03 7:11 ` Kirill Tkhai
2018-08-02 20:47 ` Andrew Morton
2018-08-03 9:02 ` Kirill Tkhai
2018-08-03 10:31 ` David Howells
2018-08-03 10:59 ` Kirill Tkhai
2018-08-03 11:04 ` Kirill Tkhai [this message]
2018-08-03 12:00 ` David Howells
2018-08-03 11:18 ` David Howells
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=190b28da-aca8-1c72-0933-94de08a48019@virtuozzo.com \
--to=ktkhai@virtuozzo.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=dhowells@redhat.com \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=shakeelb@google.com \
--cc=vdavydov.dev@gmail.com \
--cc=willy@infradead.org \
--cc=ying.huang@intel.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;
as well as URLs for NNTP newsgroup(s).