* Mutex stays locked on error
@ 2020-06-23 20:38 John van der Kamp
2020-06-23 21:04 ` Alex Deucher
0 siblings, 1 reply; 4+ messages in thread
From: John van der Kamp @ 2020-06-23 20:38 UTC (permalink / raw)
To: amd-gfx
Try to mail the patch again, this time inline. Hope this is how you can
process it.
John
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
index dcf84a61de37..949d10ef8304 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
@@ -510,8 +510,10 @@ static ssize_t srm_data_read(struct file *filp, struct kobject *kobj, struct bin
srm = psp_get_srm(work->hdcp.config.psp.handle, &srm_version, &srm_size);
- if (!srm)
- return -EINVAL;
+ if (!srm) {
+ ret = -EINVAL;
+ goto ret;
+ }
if (pos >= srm_size)
ret = 0;
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: Mutex stays locked on error
2020-06-23 20:38 Mutex stays locked on error John van der Kamp
@ 2020-06-23 21:04 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2020-06-23 21:04 UTC (permalink / raw)
To: John van der Kamp; +Cc: amd-gfx list
On Tue, Jun 23, 2020 at 5:02 PM John van der Kamp <sjonny@suffe.me.uk> wrote:
>
> Try to mail the patch again, this time inline. Hope this is how you can
> process it.
Can you use git to create the patch (git commit -a -s) and use git to
generate the patch (git format-patch -1) and then send that out? Make
sure to add your Signed-off-by. If not, I can just apply it on your
behalf if you are ok with that.
Alex
>
> John
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
> index dcf84a61de37..949d10ef8304 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
> @@ -510,8 +510,10 @@ static ssize_t srm_data_read(struct file *filp, struct kobject *kobj, struct bin
>
> srm = psp_get_srm(work->hdcp.config.psp.handle, &srm_version, &srm_size);
>
> - if (!srm)
> - return -EINVAL;
> + if (!srm) {
> + ret = -EINVAL;
> + goto ret;
> + }
>
> if (pos >= srm_size)
> ret = 0;
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Mutex stays locked on error
@ 2020-06-23 17:48 John van der Kamp
2020-06-23 19:22 ` Nirmoy
0 siblings, 1 reply; 4+ messages in thread
From: John van der Kamp @ 2020-06-23 17:48 UTC (permalink / raw)
To: amd-gfx
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
Hello,
I was reading some code and came across this which looks like a mutex not
being unlocked when an error happens. I don't know what the code does or
how to test it, but it looks quite obvious. Patch is attached.
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-diff; name=amdgpu_dm_dhcp-mutex_unlock_fix.diff, Size: 603 bytes --]
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
index dcf84a61de37..949d10ef8304 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
@@ -510,8 +510,10 @@ static ssize_t srm_data_read(struct file *filp, struct kobject *kobj, struct bin
srm = psp_get_srm(work->hdcp.config.psp.handle, &srm_version, &srm_size);
- if (!srm)
- return -EINVAL;
+ if (!srm) {
+ ret = -EINVAL;
+ goto ret;
+ }
if (pos >= srm_size)
ret = 0;
[-- Attachment #3: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-23 21:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-23 20:38 Mutex stays locked on error John van der Kamp
2020-06-23 21:04 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2020-06-23 17:48 John van der Kamp
2020-06-23 19:22 ` Nirmoy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).