Fix copy-paste error in virNetServerSetClientAuthenticated

[libvirt PATCH] Fix copy-paste error in virNetServerSetClientAuthenticated

Tim Wiederhake posted 1 patch 2 years ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20220419151127.37109-1-twiederh@redhat.com

src/rpc/virnetserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[libvirt PATCH] Fix copy-paste error in virNetServerSetClientAuthenticated

Posted by Tim Wiederhake 2 years ago

Fixes: db16792aa90cab5c9886fc2990ec13fbb20a3fb5
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
---
 src/rpc/virnetserver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 9b333f1a6c..371b72c8d6 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -827,7 +827,7 @@ virNetServerSetClientAuthenticated(virNetServer *srv,
                                    virNetServerClient *client)
 {
     VIR_LOCK_GUARD server_lock = virObjectLockGuard(srv);
-    VIR_LOCK_GUARD client_lock = virObjectLockGuard(srv);
+    VIR_LOCK_GUARD client_lock = virObjectLockGuard(client);
 
     virNetServerClientSetAuthLocked(client, VIR_NET_SERVER_SERVICE_AUTH_NONE);
     virNetServerSetClientAuthCompletedLocked(srv, client);
-- 
2.31.1

Re: [libvirt PATCH] Fix copy-paste error in virNetServerSetClientAuthenticated

Posted by Michal Prívozník 2 years ago

On 4/19/22 17:11, Tim Wiederhake wrote:
> Fixes: db16792aa90cab5c9886fc2990ec13fbb20a3fb5
> Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
> ---
>  src/rpc/virnetserver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
> index 9b333f1a6c..371b72c8d6 100644
> --- a/src/rpc/virnetserver.c
> +++ b/src/rpc/virnetserver.c
> @@ -827,7 +827,7 @@ virNetServerSetClientAuthenticated(virNetServer *srv,
>                                     virNetServerClient *client)
>  {
>      VIR_LOCK_GUARD server_lock = virObjectLockGuard(srv);
> -    VIR_LOCK_GUARD client_lock = virObjectLockGuard(srv);
> +    VIR_LOCK_GUARD client_lock = virObjectLockGuard(client);
>  
>      virNetServerClientSetAuthLocked(client, VIR_NET_SERVER_SERVICE_AUTH_NONE);
>      virNetServerSetClientAuthCompletedLocked(srv, client);

Ooops yes. This indeed fixes the deadlock I'm seeing. Sorry for letting
this slip through review.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal