Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230216014120.3110-1-k1rh4.lee@gmail.com> <9bfef283-e2ac-b2ba-386c-6833e9cb1283@linaro.org>
In-Reply-To: <9bfef283-e2ac-b2ba-386c-6833e9cb1283@linaro.org>
From:   sangsup lee <k1rh4.lee@gmail.com>
Date:   Wed, 22 Mar 2023 10:59:32 +0900
Message-ID: <CAJkuJRjKszq75M_QttFSO+zVixqfNjHBeajZFa8r0x+wnE6xiA@mail.gmail.com>
Subject: Re: [PATCH] misc: fastrpc: Fix a Use after-free-bug by race condition
To:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc:     Amol Maheshwari <amahesh@qti.qualcomm.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Sounds great.

Thank you for your recommendation.
The patch code that you recommend is clear and simple.
Please patch this.

Signed-off-by: Sangsup lee <k1rh4.lee@gmail.com>
---
 drivers/misc/fastrpc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 93ebd174d848..aa1cf0e9f4ed 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -1901,7 +1901,9 @@ static long fastrpc_device_ioctl(struct file
*file, unsigned int cmd,
                err =3D fastrpc_req_mmap(fl, argp);
                break;
        case FASTRPC_IOCTL_MUNMAP:
+               mutex_lock(&fl->mutex);
                err =3D fastrpc_req_munmap(fl, argp);
+               mutex_unlock(&fl->mutex);
                break;
        case FASTRPC_IOCTL_MEM_MAP:
                err =3D fastrpc_req_mem_map(fl, argp);
--
2.25.1


2023=EB=85=84 3=EC=9B=94 21=EC=9D=BC (=ED=99=94) =EC=98=A4=ED=9B=84 6:27, S=
rinivas Kandagatla
<srinivas.kandagatla@linaro.org>=EB=8B=98=EC=9D=B4 =EC=9E=91=EC=84=B1:
>
> Thanks Sangsup for reporting the issue and sharing the patch,
>
> Sorry, for some reason I missed this patch.
>
> On 16/02/2023 01:41, Sangsup Lee wrote:
> > This patch adds mutex_lock for fixing an Use-after-free bug.
> > fastrpc_req_munmap_impl can be called concurrently in multi-threded env=
ironments.
> > The buf which is allocated by list_for_each_safe can be used after anot=
her thread frees it.
> >
> Commit log can be improved here to something like:
>
> fastrcp_munmap takes two steps to unmap the memory, first to find a
> matching fastrpc buf in the list and second is to send request to DSP to
> unmap it.
> There is a potentially window of race between these two operations,
> which can lead to user-after-free.
>
> Fix this by adding locking around this two operations.
>
> > Signed-off-by: Sangsup Lee <k1rh4.lee@gmail.com>
> > ---
> >   drivers/misc/fastrpc.c | 7 ++++++-
> >   1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
> > index 5310606113fe..c4b5fa4a50a6 100644
> > --- a/drivers/misc/fastrpc.c
> > +++ b/drivers/misc/fastrpc.c
> > @@ -1806,10 +1806,12 @@ static int fastrpc_req_munmap(struct fastrpc_us=
er *fl, char __user *argp)
> >       struct fastrpc_buf *buf =3D NULL, *iter, *b;
> >       struct fastrpc_req_munmap req;
> >       struct device *dev =3D fl->sctx->dev;
> > +     int err;
> >
> >       if (copy_from_user(&req, argp, sizeof(req)))
> >               return -EFAULT;
> >
> > +     mutex_lock(&fl->mutex);
> >       spin_lock(&fl->lock);
> >       list_for_each_entry_safe(iter, b, &fl->mmaps, node) {
> >               if ((iter->raddr =3D=3D req.vaddrout) && (iter->size =3D=
=3D req.size)) {
> > @@ -1822,10 +1824,13 @@ static int fastrpc_req_munmap(struct fastrpc_us=
er *fl, char __user *argp)
> >       if (!buf) {
> >               dev_err(dev, "mmap\t\tpt 0x%09llx [len 0x%08llx] not in l=
ist\n",
> >                       req.vaddrout, req.size);
> > +             mutex_unlock(&fl->mutex);
> >               return -EINVAL;
> >       }
> >
> > -     return fastrpc_req_munmap_impl(fl, buf);
> > +     err =3D fastrpc_req_munmap_impl(fl, buf);
> > +     mutex_unlock(&fl->mutex);
> > +     return err;
>
> How about moving the locking to ioctl:
>
> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
> index a701132638cf..2f217071a6c3 100644
> --- a/drivers/misc/fastrpc.c
> +++ b/drivers/misc/fastrpc.c
> @@ -2087,7 +2087,9 @@ static long fastrpc_device_ioctl(struct file
> *file, unsigned int cmd,
>                  err =3D fastrpc_req_mmap(fl, argp);
>                  break;
>          case FASTRPC_IOCTL_MUNMAP:
> +               mutex_lock(&fl->mutex);
>                  err =3D fastrpc_req_munmap(fl, argp);
> +               mutex_unlock(&fl->mutex);
>                  break;
>          case FASTRPC_IOCTL_MEM_MAP:
>                  err =3D fastrpc_req_mem_map(fl, argp);
>
>
> thanks,
> srini
> >   }
> >
> >   static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *arg=
p)