Skip to contentSkip to conversation

drm/i915: Small compaction of the engine init code

bug report Dan Carpenter 3 participants 4 messages Dec 15, 2016 – Dec 16, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hello Tvrtko Ursulin,

The patch a19d6ff29a82: "drm/i915: Small compaction of the engine init code" from Jun 23, 2016, leads to the following static checker warning:

	drivers/gpu/drm/i915/intel_lrc.c:1973 logical_render_ring_init()
	warn: passing freed memory 'engine'

drivers/gpu/drm/i915/intel_lrc.c
1970
1971 ret = logical_ring_init(engine);
1972 if (ret) {
1973 lrc_destroy_wa_ctx_obj(engine);

The problem is that logical_ring_init() frees "engine" on the error path so this is a use after free.

1974 }
1975
1976 return ret;
1977 }

regards,
dan carpenter
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#1 lore raw
Quoted 9 lines · Dan Carpenter

Hello Tvrtko Ursulin,

The patch a19d6ff29a82: "drm/i915: Small compaction of the engine init code" from Jun 23, 2016, leads to the following static checker warning:

	drivers/gpu/drm/i915/intel_lrc.c:1973 logical_render_ring_init()
	warn: passing freed memory 'engine'
Quoted 8 lines

drivers/gpu/drm/i915/intel_lrc.c
1970
1971 ret = logical_ring_init(engine);
1972 if (ret) {
1973 lrc_destroy_wa_ctx_obj(engine);

The problem is that logical_ring_init() frees "engine" on the error path so this is a use after free.

And calls lrc_destroy_wa_ctx_obj() in the process. So we can

drivers/gpu/drm/i915/intel_lrc.c +1 -6
index 067394b0a769..1c1bad8ae7b0 100644
@@ -1940,12 +1940,7 @@ int logical_render_ring_init(struct intel_engine_cs *engine)
                          ret);
        }
 
-       ret = logical_ring_init(engine);
-       if (ret) {
-               lrc_destroy_wa_ctx_obj(engine);
-       }
-
-       return ret;
+       return logical_ring_init(engine);
 }
 
 int logical_xcs_ring_init(struct intel_engine_cs *engine)
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 30 lines · Chris Wilson
Quoted 9 lines · Dan Carpenter

Hello Tvrtko Ursulin,

The patch a19d6ff29a82: "drm/i915: Small compaction of the engine init code" from Jun 23, 2016, leads to the following static checker warning:

	drivers/gpu/drm/i915/intel_lrc.c:1973 logical_render_ring_init()
	warn: passing freed memory 'engine'
Quoted 8 lines

drivers/gpu/drm/i915/intel_lrc.c
1970
1971 ret = logical_ring_init(engine);
1972 if (ret) {
1973 lrc_destroy_wa_ctx_obj(engine);

The problem is that logical_ring_init() frees "engine" on the error path so this is a use after free.

And calls lrc_destroy_wa_ctx_obj() in the process. So we can

drivers/gpu/drm/i915/intel_lrc.c +0 -0
index 067394b0a769..1c1bad8ae7b0 100644
@@ -1940,12 +1940,7 @@ int logical_render_ring_init(struct intel_engine_cs *engine)
                          ret);
        }
 

drivers/gpu/drm/i915/intel_lrc.c int logical_render_ring_init(struct intel_engine_cs *engine) · line 1946

Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +1 -6
-       ret = logical_ring_init(engine);
-       if (ret) {
-               lrc_destroy_wa_ctx_obj(engine);
-       }
-
-       return ret;
+       return logical_ring_init(engine);
 }
 
 int logical_xcs_ring_init(struct intel_engine_cs *engine)

I've marked this as TODO for later.

Interesting that it was detected only now. Even more so, the referenced commit just moved the code around.

I think that the real issue was introduced around "drm/i915/gen8: Re-order init pipe_control in lrc mode".

Regards,

Tvrtko

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 47 lines · Tvrtko Ursulin
Quoted 40 lines · Chris Wilson
Quoted 9 lines · Dan Carpenter

Hello Tvrtko Ursulin,

The patch a19d6ff29a82: "drm/i915: Small compaction of the engine init code" from Jun 23, 2016, leads to the following static checker warning:

drivers/gpu/drm/i915/intel_lrc.c:1973 logical_render_ring_init()
warn: passing freed memory 'engine'

Quoted 8 lines

drivers/gpu/drm/i915/intel_lrc.c
1970
1971 ret = logical_ring_init(engine);
1972 if (ret) {
1973 lrc_destroy_wa_ctx_obj(engine);

The problem is that logical_ring_init() frees "engine" on the error path so this is a use after free.

And calls lrc_destroy_wa_ctx_obj() in the process. So we can

drivers/gpu/drm/i915/intel_lrc.c +1 -6
index 067394b0a769..1c1bad8ae7b0 100644
@@ -1940,12 +1940,7 @@ int logical_render_ring_init(struct
 intel_engine_cs *engine)
                          ret);
        }
 
-       ret = logical_ring_init(engine);
-       if (ret) {
-               lrc_destroy_wa_ctx_obj(engine);
-       }
-
-       return ret;
+       return logical_ring_init(engine);
 }
 
Quoted 2 lines

int logical_xcs_ring_init(struct intel_engine_cs *engine)

I've marked this as TODO for later.

Quoted 5 lines

Interesting that it was detected only now. Even more so, the referenced commit just moved the code around.

I think that the real issue was introduced around "drm/i915/gen8:
Re-order init pipe_control in lrc mode".

Actually it was probably the dynamic engine allocation patch.

Regards,

Tvrtko
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel