rtnl_link_af_unregister: fix locking

rtnl_link_af_unregister() attempts to write-lock info_lock twice
instead of releasing it before returning.  It also will return with
info_lock write-locked if passed a NULL ops.

Signed-off-by: Thomas Graf <tgraf@suug.ch>

diff --git a/lib/route/link/api.c b/lib/route/link/api.c
index 352bb839682626de455b8ce6feb75239330ce79a..6d1e12f88b2121158f65fc62d5bf2890c6d1e7b1 100644 (file)
--- a/lib/route/link/api.c
+++ b/lib/route/link/api.c
@@ -326,7 +326,7 @@ int rtnl_link_af_unregister(struct rtnl_link_af_ops *ops)
        int err = -NLE_INVAL;
 
        if (!ops)
-               goto errout;
+               return err;
 
        nl_write_lock(&info_lock);
        if (!af_ops[ops->ao_family]) {
@@ -345,7 +345,7 @@ int rtnl_link_af_unregister(struct rtnl_link_af_ops *ops)
                ops->ao_family);
 
 errout:
-       nl_write_lock(&info_lock);
+       nl_write_unlock(&info_lock);
 
        return err;
 }