From: Jani Nikula <jani.nikula@linux.intel.com>
To: Nirmoy Das <nirmoy.das@intel.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org, Nirmoy Das <nirmoy.das@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Prevent potential UAF in engine_init_common
Date: Wed, 11 Oct 2023 15:20:34 +0300 [thread overview]
Message-ID: <87fs2h4agd.fsf@intel.com> (raw)
In-Reply-To: <20231011115451.12521-1-nirmoy.das@intel.com>
On Wed, 11 Oct 2023, Nirmoy Das <nirmoy.das@intel.com> wrote:
> If measure_breadcrumb_dw() returns an error and bce isn't created,
> this commit ensures that intel_engine_destroy_pinned_context()
> is not called with a NULL bce.
So it's a potential NULL pointer dereference, not use after free like
the subject says. Please fix the subject.
BR,
Jani.
>
> Fixes: b35274993680 ("drm/i915: Create a kernel context for GGTT updates")
> Cc: Oak Zeng <oak.zeng@intel.com>
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> index 179d9546865b..4a11219e560e 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> @@ -1491,7 +1491,8 @@ static int engine_init_common(struct intel_engine_cs *engine)
> return 0;
>
> err_bce_context:
> - intel_engine_destroy_pinned_context(bce);
> + if (bce)
> + intel_engine_destroy_pinned_context(bce);
> err_ce_context:
> intel_engine_destroy_pinned_context(ce);
> return ret;
--
Jani Nikula, Intel
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Nirmoy Das <nirmoy.das@intel.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org, Oak Zeng <oak.zeng@intel.com>,
Andi Shyti <andi.shyti@linux.intel.com>,
Nirmoy Das <nirmoy.das@intel.com>
Subject: Re: [PATCH] drm/i915: Prevent potential UAF in engine_init_common
Date: Wed, 11 Oct 2023 15:20:34 +0300 [thread overview]
Message-ID: <87fs2h4agd.fsf@intel.com> (raw)
In-Reply-To: <20231011115451.12521-1-nirmoy.das@intel.com>
On Wed, 11 Oct 2023, Nirmoy Das <nirmoy.das@intel.com> wrote:
> If measure_breadcrumb_dw() returns an error and bce isn't created,
> this commit ensures that intel_engine_destroy_pinned_context()
> is not called with a NULL bce.
So it's a potential NULL pointer dereference, not use after free like
the subject says. Please fix the subject.
BR,
Jani.
>
> Fixes: b35274993680 ("drm/i915: Create a kernel context for GGTT updates")
> Cc: Oak Zeng <oak.zeng@intel.com>
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> index 179d9546865b..4a11219e560e 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> @@ -1491,7 +1491,8 @@ static int engine_init_common(struct intel_engine_cs *engine)
> return 0;
>
> err_bce_context:
> - intel_engine_destroy_pinned_context(bce);
> + if (bce)
> + intel_engine_destroy_pinned_context(bce);
> err_ce_context:
> intel_engine_destroy_pinned_context(ce);
> return ret;
--
Jani Nikula, Intel
next prev parent reply other threads:[~2023-10-11 12:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 11:54 [Intel-gfx] [PATCH] drm/i915: Prevent potential UAF in engine_init_common Nirmoy Das
2023-10-11 11:54 ` Nirmoy Das
2023-10-11 12:20 ` Jani Nikula [this message]
2023-10-11 12:20 ` Jani Nikula
2023-10-11 12:22 ` [Intel-gfx] " Nirmoy Das
2023-10-11 12:22 ` Nirmoy Das
2023-10-11 12:22 ` [Intel-gfx] " Andi Shyti
2023-10-11 12:22 ` Andi Shyti
2023-10-11 12:26 ` [Intel-gfx] " Nirmoy Das
2023-10-11 12:26 ` Nirmoy Das
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=87fs2h4agd.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=nirmoy.das@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.