Skip to contentSkip to conversation

libnfnetlink-1.0.0 iftable.c:nlif_open() has handler unregister error

PATCH Applied Kuzin Andrey 2 participants 2 messages Sep 30, 2010 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libnfnetlink-1.0.0 iftable.c:nlif_open() has handler unregister error

struct nlif_handle *nlif_open(void)
{
..........

    if (rtnl_handler_register(h->rtnl_handle, &h->ifadd_handler) < 0)
         goto err_close;
    if (rtnl_handler_register(h->rtnl_handle, &h->ifdel_handler) < 0)
         goto err_unregister;
    return h;
err_unregister:
    rtnl_handler_unregister(h->rtnl_handle, &h->ifdel_handler);
err_close:
    rtnl_close(h->rtnl_handle);
    free(h);
err:
    return NULL;
}

Here if was error after rtnl_handler_register(... ifdel_handler...) need to unregister the ifadd_handler, but in err_unregister: try to unregister the the ifdel_handler.

b/iftable.c renamed from a/iftable.c +1 -1
@@ -245,7 +245,7 @@ struct nlif_handle *nlif_open(void)
 	return h;
 
 err_unregister:
-	rtnl_handler_unregister(h->rtnl_handle, &h->ifdel_handler);
+	rtnl_handler_unregister(h->rtnl_handle, &h->ifadd_handler);
 err_close:
 	rtnl_close(h->rtnl_handle);
 	free(h);
maintainer Applied
#1 lore raw
Quoted 18 lines · Kuzin Andrey

struct nlif_handle *nlif_open(void)
{
..........

    if (rtnl_handler_register(h->rtnl_handle, &h->ifadd_handler) < 0)
         goto err_close;
    if (rtnl_handler_register(h->rtnl_handle, &h->ifdel_handler) < 0)
         goto err_unregister;
    return h;
err_unregister:
    rtnl_handler_unregister(h->rtnl_handle, &h->ifdel_handler);
err_close:
    rtnl_close(h->rtnl_handle);
    free(h);
err:
    return NULL;
}
Quoted 2 lines

Here if was error after rtnl_handler_register(... ifdel_handler...) need to unregister the ifadd_handler, but in err_unregister: try to unregister the the ifdel_handler.

Applied, thanks Andrey.