From 2a3fb0aa3c0eef580c11572089bacc65cfd4290a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 24 Apr 2014 16:58:45 -0700 Subject: [PATCH] lacp: Don't lock potentially uninitialized mutex in lacp_status(). If the 'lacp' parameter is nonnull, then we know that the file scope mutex has been initialized, since that's done as a side effect of creating a lacp object, but otherwise there's no guarantee. Signed-off-by: Ben Pfaff --- lib/lacp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/lacp.c b/lib/lacp.c index 4aee64f48..49ae5e5a2 100644 --- a/lib/lacp.c +++ b/lib/lacp.c @@ -345,18 +345,18 @@ out: enum lacp_status lacp_status(const struct lacp *lacp) OVS_EXCLUDED(mutex) { - enum lacp_status ret; + if (lacp) { + enum lacp_status ret; - ovs_mutex_lock(&mutex); - if (!lacp) { - ret = LACP_DISABLED; - } else if (lacp->negotiated) { - ret = LACP_NEGOTIATED; + ovs_mutex_lock(&mutex); + ret = lacp->negotiated ? LACP_NEGOTIATED : LACP_CONFIGURED; + ovs_mutex_unlock(&mutex); + return ret; } else { - ret = LACP_CONFIGURED; + /* Don't take 'mutex'. It might not even be initialized, since we + * don't know that any lacp object has been created. */ + return LACP_DISABLED; } - ovs_mutex_unlock(&mutex); - return ret; } /* Registers 'slave_' as subordinate to 'lacp'. This should be called at least -- 2.43.0