drm/i915: use error path
Subsystems (3)
PATCH RESEND 1/3 drm/i915: use error path
Use goto to handle the error path to avoid duplicating the same code. In the error path intel_dig_port is the last one to be released as it was the first one to be allocated and ideally the error path should be the reverse of the execution path.
---
Sent on 27/07/2015
drivers/gpu/drm/i915/intel_dp.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +14 -9
@@ -6168,10 +6168,8 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)return ; intel_connector =intel_connector_alloc (); -if (!intel_connector) { -kfree (intel_dig_port); -return ; - } +if (!intel_connector) + goto err_connector_alloc; intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base;
@@ -6219,11 +6217,18 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port; -if (!intel_dp_init_connector (intel_dig_port, intel_connector)) { -drm_encoder_cleanup (encoder); -kfree (intel_dig_port); -kfree (intel_connector); - } +if (!intel_dp_init_connector (intel_dig_port, intel_connector)) + goto err_init_connector; + +return ; + +err_init_connector: +drm_encoder_cleanup (encoder); +kfree (intel_connector); +err_connector_alloc: +kfree (intel_dig_port); + +return ; }void intel_dp_mst_suspend (struct drm_device *dev)
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH RESEND 2/3 drm/i915: check for return value
We were not checking the return value of drm_encoder_init() which can fail. And if it fails then we will be working with an uninitialized encoder.
---
Sent on 27/07/2015
drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +4 -2
@@ -6174,8 +6174,9 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base; -drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, -DRM_MODE_ENCODER_TMDS ); +if (drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, +DRM_MODE_ENCODER_TMDS )) + goto err_encoder_init; intel_encoder->compute_config = intel_dp_compute_config; intel_encoder->disable = intel_disable_dp;
@@ -6224,6 +6225,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) err_init_connector:drm_encoder_cleanup (encoder); +err_encoder_init:kfree (intel_connector); err_connector_alloc:kfree (intel_dig_port);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH RESEND 2/3] drm/i915: check for return value
Quoted 7 lines · Sudip Mukherjee
We were not checking the return value of
drm_encoder_init()which can fail. And if it fails then we will be working with an uninitialized encoder.Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Sudip Mukherjee <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 34 lines
---
Sent on 27/07/2015
drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +4
-2@@ -6174,8 +6174,9 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base; -drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, -DRM_MODE_ENCODER_TMDS ); +if (drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, +DRM_MODE_ENCODER_TMDS )) + goto err_encoder_init; intel_encoder->compute_config = intel_dp_compute_config; intel_encoder->disable = intel_disable_dp;@@ -6224,6 +6225,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) err_init_connector:drm_encoder_cleanup (encoder); +err_encoder_init:kfree (intel_connector); err_connector_alloc:kfree (intel_dig_port);Signature · 1 line
1.9.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH RESEND 2/3] drm/i915: check for return value
Quoted 11 lines · Daniel Vetter
Quoted 7 lines · Sudip Mukherjee
We were not checking the return value of
drm_encoder_init()which can fail. And if it fails then we will be working with an uninitialized encoder.Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Sudip Mukherjee <[email protected]>Queued for -next, thanks for the patch.
-Daniel
Hi Daniel,
It is still not there in linux-next. Still applies cleanly on next-20151209.
regards
sudip
Quoted 26 lines
Quoted 26 lines
---
Sent on 27/07/2015
drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +3
-2@@ -6174,8 +6174,9 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base; -drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, -DRM_MODE_ENCODER_TMDS ); +if (drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, +DRM_MODE_ENCODER_TMDS )) + goto err_encoder_init; intel_encoder->compute_config = intel_dp_compute_config; intel_encoder->disable = intel_disable_dp;@@ -6224,6 +6225,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
Quoted 14 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0err_init_connector:drm_encoder_cleanup (encoder); +err_encoder_init:kfree (intel_connector); err_connector_alloc:kfree (intel_dig_port);Signature · 1 line
1.9.1Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH RESEND 2/3] drm/i915: check for return value
Quoted 10 lines · Sudip Mukherjee
Quoted 9 lines · Daniel Vetter
Quoted 7 lines · Sudip Mukherjee
We were not checking the return value of
drm_encoder_init()which can fail. And if it fails then we will be working with an uninitialized encoder.Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Sudip Mukherjee <[email protected]>
Quoted 6 lines
Quoted 2 lines
Queued for -next, thanks for the patch.
-DanielHi Daniel,
It is still not there in linux-next. Still applies cleanly on next-20151209.
Sorry, this must have fallen through the cracks somehow. Applied now for real.
Thanks, Daniel
Quoted 48 lines
regards
sudipQuoted 26 lines
Quoted 26 lines
---
Sent on 27/07/2015
drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +3
-2@@ -6174,8 +6174,9 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base; -drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, -DRM_MODE_ENCODER_TMDS ); +if (drm_encoder_init (dev, &intel_encoder->base, &intel_dp_enc_funcs, +DRM_MODE_ENCODER_TMDS )) + goto err_encoder_init; intel_encoder->compute_config = intel_dp_compute_config; intel_encoder->disable = intel_disable_dp;@@ -6224,6 +6225,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)Quoted 14 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0err_init_connector:drm_encoder_cleanup (encoder); +err_encoder_init:kfree (intel_connector); err_connector_alloc:kfree (intel_dig_port);Signature · 1 line
1.9.1Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 3/3 drm/amdgpu: fix memory leak
In reply to Sudip MukherjeeIf amdgpu_ib_get() fails we returned the error code but we missed freeing ib.
---
Sent on 18/09/2015
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -1
@@ -455,8 +455,10 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,return -ENOMEM ; r =amdgpu_ib_get (ring,NULL , ndw *4 , ib); -if (r) +if (r) { +kfree (ib);return r; + } ib->length_dw =0 ;/* walk over the address space and update the page directory */
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH RESEND 3/3] drm/amdgpu: fix memory leak
Quoted 9 lines · Sudip Mukherjee
If
amdgpu_ib_get()fails we returned the error code but we missed freeing ib.Cc "Christian König" <[email protected]>Cc Jammy Zhou <[email protected]>Cc Chunming Zhou <[email protected]>Cc Alex Deucher <[email protected]>Cc "monk.liu" <[email protected]>Signed-off-by Sudip Mukherjee <[email protected]>
Quoted 3 lines
---
Sent on 18/09/2015
I somehow missed this before. Applied. Thanks!
Alex
Quoted 23 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3
-2@@ -455,8 +455,10 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,return -ENOMEM ; r =amdgpu_ib_get (ring,NULL , ndw *4 , ib); -if (r) +if (r) { +kfree (ib);return r; + } ib->length_dw =0 ;/* walk over the address space and update the page directory */ --1.9.1
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter
AppliedQuoted 8 lines · Sudip Mukherjee
Use goto to handle the error path to avoid duplicating the same code. In the error path
intel_dig_portis the last one to be released as it was the first one to be allocated and ideally the error path should be the reverse of the execution path.Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Sudip Mukherjee <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 51 lines
---
Sent on 27/07/2015
drivers/gpu/drm/i915/intel_dp.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_dp.c +14
-9@@ -6168,10 +6168,8 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)return ; intel_connector =intel_connector_alloc (); -if (!intel_connector) { -kfree (intel_dig_port); -return ; - } +if (!intel_connector) + goto err_connector_alloc; intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base;@@ -6219,11 +6217,18 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port; -if (!intel_dp_init_connector (intel_dig_port, intel_connector)) { -drm_encoder_cleanup (encoder); -kfree (intel_dig_port); -kfree (intel_connector); - } +if (!intel_dp_init_connector (intel_dig_port, intel_connector)) + goto err_init_connector; + +return ; + +err_init_connector: +drm_encoder_cleanup (encoder); +kfree (intel_connector); +err_connector_alloc: +kfree (intel_dig_port); + +return ; }void intel_dp_mst_suspend (struct drm_device *dev)Signature · 1 line
1.9.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx