Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20201110084245.3067324-1-luomeng12@huawei.com> <20201111183129.3c58ca0c381e30d05b1392c8@kernel.org>
In-Reply-To: <20201111183129.3c58ca0c381e30d05b1392c8@kernel.org>
From:   Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date:   Tue, 17 Nov 2020 20:08:08 -0800
Message-ID: <CAADnVQ+u0bxvAC+EpdGTsg023UtVAcXyUcV4kKWF+ia6ZxBJ5Q@mail.gmail.com>
Subject: Re: [PATCH] fail_function: remove a redundant mutex unlock
To:     Masami Hiramatsu <mhiramat@kernel.org>
Cc:     Luo Meng <luomeng12@huawei.com>, Josef Bacik <jbacik@fb.com>,
        Alexei Starovoitov <ast@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>, stable@kernel.vger.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Nov 11, 2020 at 1:31 AM Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> Hi Luo,
>
> On Tue, 10 Nov 2020 16:42:45 +0800
> Luo Meng <luomeng12@huawei.com> wrote:
>
> > Fix a mutex_unlock() issue where before copy_from_user() is
> > not called mutex_locked.
>
> Oops, thank you for the fix.
>
> Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Did anyone pick this up?
If not, please resend cc-ing bpf@vger so it can get into patchwork and
be processed by bpf maintainers.

Thanks!

> >
> > Fixes: 4b1a29a7f542 ("error-injection: Support fault injection framework")
> > Reported-by: Hulk Robot <hulkci@huawei.com>
> > Signed-off-by: Luo Meng <luomeng12@huawei.com>
> > ---
> >  kernel/fail_function.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/fail_function.c b/kernel/fail_function.c
> > index 63b349168da7..b0b1ad93fa95 100644
> > --- a/kernel/fail_function.c
> > +++ b/kernel/fail_function.c
> > @@ -253,7 +253,7 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
> >
> >       if (copy_from_user(buf, buffer, count)) {
> >               ret = -EFAULT;
> > -             goto out;
> > +             goto out_free;
> >       }
> >       buf[count] = '\0';
> >       sym = strstrip(buf);
> > @@ -307,8 +307,9 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
> >               ret = count;
> >       }
> >  out:
> > -     kfree(buf);
> >       mutex_unlock(&fei_lock);
> > +out_free:
> > +     kfree(buf);
> >       return ret;
> >  }
> >
> > --
> > 2.25.4
> >
>
>
> --
> Masami Hiramatsu <mhiramat@kernel.org>