mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Felix Kuehling <felix.kuehling@amd.com>
To: Jann Horn <jannh@google.com>,
	Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Cc: "David Yat Sin" <david.yatsin@amd.com>,
	"Alex Deucher" <alexander.deucher@amd.com>,
	"kernel list" <linux-kernel@vger.kernel.org>,
	amd-gfx@lists.freedesktop.org, "Pan, Xinhui" <Xinhui.Pan@amd.com>,
	"Christian König" <christian.koenig@amd.com>
Subject: Re: [BUG] AMDKFD: criu_checkpoint() error path treats userspace pointer as kernel pointer
Date: Mon, 31 Oct 2022 13:53:55 -0400	[thread overview]
Message-ID: <425617d8-3d36-f50e-e582-826a4c6da32d@amd.com> (raw)
In-Reply-To: <CAG48ez3a_35R48khgW8D1MxokEqmYP3mBsUwhMq5Vfi5BiyYCQ@mail.gmail.com>

Am 2022-10-31 um 10:20 schrieb Jann Horn:
> be072b06c73970 ("drm/amdkfd: CRIU export BOs as prime dmabuf objects")
> added an error path in criu_checkpoint() that (unless I'm completely
> misreading this) treats the userspace-supplied args->bos (which was
> previously used as a userspace pointer when passed to
> criu_checkpoint_bos()) as a kernel pointer:
>
>    ret = criu_checkpoint_bos(p, num_bos, (uint8_t __user *)args->bos,
>        (uint8_t __user *)args->priv_data, &priv_offset);
>    if (ret)
>      goto exit_unlock;
>    [...]
> close_bo_fds:
>    if (ret) {
>      /* If IOCTL returns err, user assumes all FDs opened in
> criu_dump_bos are closed */
>      uint32_t i;
>      struct kfd_criu_bo_bucket *bo_buckets = (struct kfd_criu_bo_bucket
> *) args->bos;
>
>      for (i = 0; i < num_bos; i++) {
>        if (bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM)
>          close_fd(bo_buckets[i].dmabuf_fd);
>      }
>    }
>
> This seems very wrong, and also like it's guaranteed to blow up as
> soon as it runs on a machine with SMAP, which makes me think that this
> codepath was probably never exercised?
>
> (Also note that just changing this to copy_from_user() instead would
> still be wrong, because malicious/bogus userspace could change the FD
> number to the KFD device's FD, and the VFS assumes that an FD can't be
> closed while it's being accessed in a single-threaded process.)

Thank you for catching this, and thank you for the advice. In other 
words, we need to store a copy of the FDs in a kernel mode buffer that 
is not accessibly by usermode, so we can reliably close the correct FDs 
in the error handling code path. Rajneesh and I will fix this ASAP.

Do you think we should also avoid copying the FDs to usermode before 
we're sure that we'll return success? I don't think it would make a big 
difference because user mode could try to guess the FDs and use them 
before we return from the ioctl either way.

Regards,
   Felix



  reply	other threads:[~2022-10-31 17:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-31 14:20 Jann Horn
2022-10-31 17:53 ` Felix Kuehling [this message]
2022-10-31 17:57   ` Jann Horn

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=425617d8-3d36-f50e-e582-826a4c6da32d@amd.com \
    --to=felix.kuehling@amd.com \
    --cc=Xinhui.Pan@amd.com \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=christian.koenig@amd.com \
    --cc=david.yatsin@amd.com \
    --cc=jannh@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rajneesh.bhardwaj@amd.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

all inboxes | Powered by JetHome®