* [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
@ 2024-02-19 13:14 Tvrtko Ursulin
2024-02-19 20:02 ` Rodrigo Vivi
2024-02-22 17:51 ` Maxime Ripard
0 siblings, 2 replies; 6+ messages in thread
From: Tvrtko Ursulin @ 2024-02-19 13:14 UTC (permalink / raw)
To: Intel-gfx, dri-devel
Cc: Tvrtko Ursulin, Dan Carpenter, Jani Nikula, Luca Coelho,
Maxime Ripard, Jani Nikula
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Request can be NULL if no guilty request was identified so simply use
engine->i915 instead.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: d50892a9554c ("drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Luca Coelho <luciano.coelho@intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
index 5f8d86e25993..8d4bb95f8424 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
@@ -96,8 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
static void show_heartbeat(const struct i915_request *rq,
struct intel_engine_cs *engine)
{
- struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
- "heartbeat");
+ struct drm_printer p =
+ drm_dbg_printer(&engine->i915->drm, DRM_UT_DRIVER, "heartbeat");
if (!rq) {
intel_engine_dump(engine, &p,
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
2024-02-19 13:14 [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion Tvrtko Ursulin
@ 2024-02-19 20:02 ` Rodrigo Vivi
2024-02-20 9:16 ` Tvrtko Ursulin
2024-02-22 17:51 ` Maxime Ripard
1 sibling, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2024-02-19 20:02 UTC (permalink / raw)
To: Tvrtko Ursulin
Cc: Intel-gfx, dri-devel, Tvrtko Ursulin, Dan Carpenter, Jani Nikula,
Luca Coelho, Maxime Ripard, Jani Nikula
On Mon, Feb 19, 2024 at 01:14:23PM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Request can be NULL if no guilty request was identified so simply use
> engine->i915 instead.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Fixes: d50892a9554c ("drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Luca Coelho <luciano.coelho@intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> index 5f8d86e25993..8d4bb95f8424 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
> @@ -96,8 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
> static void show_heartbeat(const struct i915_request *rq,
> struct intel_engine_cs *engine)
> {
> - struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
> - "heartbeat");
> + struct drm_printer p =
> + drm_dbg_printer(&engine->i915->drm, DRM_UT_DRIVER, "heartbeat");
>
> if (!rq) {
> intel_engine_dump(engine, &p,
> --
> 2.40.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
2024-02-19 20:02 ` Rodrigo Vivi
@ 2024-02-20 9:16 ` Tvrtko Ursulin
2024-02-20 10:36 ` Maxime Ripard
0 siblings, 1 reply; 6+ messages in thread
From: Tvrtko Ursulin @ 2024-02-20 9:16 UTC (permalink / raw)
To: Rodrigo Vivi, Thomas Zimmermann, Maxime Ripard
Cc: Intel-gfx, dri-devel, Tvrtko Ursulin, Dan Carpenter, Jani Nikula,
Luca Coelho, Jani Nikula
On 19/02/2024 20:02, Rodrigo Vivi wrote:
> On Mon, Feb 19, 2024 at 01:14:23PM +0000, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> Request can be NULL if no guilty request was identified so simply use
>> engine->i915 instead.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Fixes: d50892a9554c ("drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()")
>> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: Luca Coelho <luciano.coelho@intel.com>
>> Cc: Maxime Ripard <mripard@kernel.org>
>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks Rodrigo!
Given how d50892a9554c landed via drm-misc-next, Maxime or Thomas -
could you take this via drm-misc-next-fixes or if there will be another
drm-misc-next pull request?
Regards,
Tvrtko
>
>> ---
>> drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
>> index 5f8d86e25993..8d4bb95f8424 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
>> @@ -96,8 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
>> static void show_heartbeat(const struct i915_request *rq,
>> struct intel_engine_cs *engine)
>> {
>> - struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
>> - "heartbeat");
>> + struct drm_printer p =
>> + drm_dbg_printer(&engine->i915->drm, DRM_UT_DRIVER, "heartbeat");
>>
>> if (!rq) {
>> intel_engine_dump(engine, &p,
>> --
>> 2.40.1
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
2024-02-20 9:16 ` Tvrtko Ursulin
@ 2024-02-20 10:36 ` Maxime Ripard
2024-02-20 13:45 ` Tvrtko Ursulin
0 siblings, 1 reply; 6+ messages in thread
From: Maxime Ripard @ 2024-02-20 10:36 UTC (permalink / raw)
To: Tvrtko Ursulin
Cc: Rodrigo Vivi, Thomas Zimmermann, Intel-gfx, dri-devel,
Tvrtko Ursulin, Dan Carpenter, Jani Nikula, Luca Coelho,
Jani Nikula
[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]
On Tue, Feb 20, 2024 at 09:16:43AM +0000, Tvrtko Ursulin wrote:
>
> On 19/02/2024 20:02, Rodrigo Vivi wrote:
> > On Mon, Feb 19, 2024 at 01:14:23PM +0000, Tvrtko Ursulin wrote:
> > > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > >
> > > Request can be NULL if no guilty request was identified so simply use
> > > engine->i915 instead.
> > >
> > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > > Fixes: d50892a9554c ("drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()")
> > > Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > Cc: Luca Coelho <luciano.coelho@intel.com>
> > > Cc: Maxime Ripard <mripard@kernel.org>
> > > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> >
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Thanks Rodrigo!
>
> Given how d50892a9554c landed via drm-misc-next, Maxime or Thomas - could
> you take this via drm-misc-next-fixes or if there will be another
> drm-misc-next pull request?
There will be a drm-misc-next PR on thursday
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
2024-02-20 10:36 ` Maxime Ripard
@ 2024-02-20 13:45 ` Tvrtko Ursulin
0 siblings, 0 replies; 6+ messages in thread
From: Tvrtko Ursulin @ 2024-02-20 13:45 UTC (permalink / raw)
To: Maxime Ripard
Cc: Rodrigo Vivi, Thomas Zimmermann, Intel-gfx, dri-devel,
Tvrtko Ursulin, Dan Carpenter, Jani Nikula, Luca Coelho,
Jani Nikula
On 20/02/2024 10:36, Maxime Ripard wrote:
> On Tue, Feb 20, 2024 at 09:16:43AM +0000, Tvrtko Ursulin wrote:
>>
>> On 19/02/2024 20:02, Rodrigo Vivi wrote:
>>> On Mon, Feb 19, 2024 at 01:14:23PM +0000, Tvrtko Ursulin wrote:
>>>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>>>
>>>> Request can be NULL if no guilty request was identified so simply use
>>>> engine->i915 instead.
>>>>
>>>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>>> Fixes: d50892a9554c ("drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()")
>>>> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>> Cc: Luca Coelho <luciano.coelho@intel.com>
>>>> Cc: Maxime Ripard <mripard@kernel.org>
>>>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>>>
>>> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>
>> Thanks Rodrigo!
>>
>> Given how d50892a9554c landed via drm-misc-next, Maxime or Thomas - could
>> you take this via drm-misc-next-fixes or if there will be another
>> drm-misc-next pull request?
>
> There will be a drm-misc-next PR on thursday
Could you pull this one into which branch is needed so it appears in
that pull request?
Regards,
Tvrtko
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion
2024-02-19 13:14 [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion Tvrtko Ursulin
2024-02-19 20:02 ` Rodrigo Vivi
@ 2024-02-22 17:51 ` Maxime Ripard
1 sibling, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2024-02-22 17:51 UTC (permalink / raw)
To: Intel-gfx, dri-devel, Tvrtko Ursulin
Cc: Maxime Ripard, Tvrtko Ursulin, Dan Carpenter, Jani Nikula,
Luca Coelho, Jani Nikula
On Mon, 19 Feb 2024 13:14:23 +0000, Tvrtko Ursulin wrote:
> Request can be NULL if no guilty request was identified so simply use
> engine->i915 instead.
>
>
Applied to drm/drm-misc (drm-misc-next-fixes).
Thanks!
Maxime
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-22 17:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-19 13:14 [PATCH] drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion Tvrtko Ursulin
2024-02-19 20:02 ` Rodrigo Vivi
2024-02-20 9:16 ` Tvrtko Ursulin
2024-02-20 10:36 ` Maxime Ripard
2024-02-20 13:45 ` Tvrtko Ursulin
2024-02-22 17:51 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox