* [PATCH] drm/i915: uninitialized value on error path
@ 2017-04-13 19:53 Dan Carpenter
2017-04-13 20:29 ` Chris Wilson
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2017-04-13 19:53 UTC (permalink / raw)
To: Daniel Vetter, Maarten Lankhorst
Cc: Jani Nikula, David Airlie, intel-gfx, dri-devel, kernel-janitors
"ret" isn't initialized on this error path. It doesn't really cause
any problems unless it's randomly set to -EDEADLK which is not likely.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 48a546210d8b..d0e9578952d5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9563,6 +9563,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
*/
if (!crtc) {
DRM_DEBUG_KMS("no pipe available for load-detect\n");
+ ret = -ENODEV;
goto fail;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: uninitialized value on error path
2017-04-13 19:53 [PATCH] drm/i915: uninitialized value on error path Dan Carpenter
@ 2017-04-13 20:29 ` Chris Wilson
2017-04-13 21:13 ` Dan Carpenter
2017-04-14 19:54 ` [PATCH v2] drm/i915: set "ret" correctly on error paths Dan Carpenter
0 siblings, 2 replies; 5+ messages in thread
From: Chris Wilson @ 2017-04-13 20:29 UTC (permalink / raw)
To: Dan Carpenter; +Cc: kernel-janitors, Daniel Vetter, intel-gfx, dri-devel
On Thu, Apr 13, 2017 at 10:53:11PM +0300, Dan Carpenter wrote:
> "ret" isn't initialized on this error path. It doesn't really cause
> any problems unless it's randomly set to -EDEADLK which is not likely.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 48a546210d8b..d0e9578952d5 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9563,6 +9563,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
> */
> if (!crtc) {
> DRM_DEBUG_KMS("no pipe available for load-detect\n");
> + ret = -ENODEV;
> goto fail;
> }
Looks like we need
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8ffeda9d349b..4d0b3d80ed24 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9618,6 +9618,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
DRM_DEBUG_KMS("reusing fbdev for load-detection framebuffer\n");
if (IS_ERR(fb)) {
DRM_DEBUG_KMS("failed to allocate framebuffer for load-detection\n");
+ ret = PTR_ERR(fb);
goto fail;
}
as well.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: uninitialized value on error path
2017-04-13 20:29 ` Chris Wilson
@ 2017-04-13 21:13 ` Dan Carpenter
2017-04-14 19:54 ` [PATCH v2] drm/i915: set "ret" correctly on error paths Dan Carpenter
1 sibling, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2017-04-13 21:13 UTC (permalink / raw)
To: Chris Wilson, Daniel Vetter, Maarten Lankhorst, intel-gfx,
kernel-janitors, dri-devel
True. I'll resend.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] drm/i915: set "ret" correctly on error paths
2017-04-13 20:29 ` Chris Wilson
2017-04-13 21:13 ` Dan Carpenter
@ 2017-04-14 19:54 ` Dan Carpenter
2017-04-15 9:32 ` Chris Wilson
1 sibling, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2017-04-14 19:54 UTC (permalink / raw)
To: Daniel Vetter, Maarten Lankhorst, Chris Wilson
Cc: intel-gfx, kernel-janitors, dri-devel
If "crtc" is NULL, then my static checker complains that "ret" isn't
initialized on that path. It doesn't really cause a problem unless
"ret" is somehow set to -EDEADLK which is not likely.
Chris Wilson also noticed another error path where "ret" isn't set
correctly.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 48a546210d8b..2c66de875d3d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9563,6 +9563,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
*/
if (!crtc) {
DRM_DEBUG_KMS("no pipe available for load-detect\n");
+ ret = -ENODEV;
goto fail;
}
@@ -9619,6 +9620,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
DRM_DEBUG_KMS("reusing fbdev for load-detection framebuffer\n");
if (IS_ERR(fb)) {
DRM_DEBUG_KMS("failed to allocate framebuffer for load-detection\n");
+ ret = PTR_ERR(fb);
goto fail;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] drm/i915: set "ret" correctly on error paths
2017-04-14 19:54 ` [PATCH v2] drm/i915: set "ret" correctly on error paths Dan Carpenter
@ 2017-04-15 9:32 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2017-04-15 9:32 UTC (permalink / raw)
To: Dan Carpenter
Cc: Daniel Vetter, Maarten Lankhorst, Jani Nikula, David Airlie,
intel-gfx, dri-devel, kernel-janitors
On Fri, Apr 14, 2017 at 10:54:25PM +0300, Dan Carpenter wrote:
> If "crtc" is NULL, then my static checker complains that "ret" isn't
> initialized on that path. It doesn't really cause a problem unless
> "ret" is somehow set to -EDEADLK which is not likely.
>
> Chris Wilson also noticed another error path where "ret" isn't set
> correctly.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Pushed, thanks very much for the patch.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-15 9:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-13 19:53 [PATCH] drm/i915: uninitialized value on error path Dan Carpenter
2017-04-13 20:29 ` Chris Wilson
2017-04-13 21:13 ` Dan Carpenter
2017-04-14 19:54 ` [PATCH v2] drm/i915: set "ret" correctly on error paths Dan Carpenter
2017-04-15 9:32 ` Chris Wilson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox