[batctl] master: batctl: Free nl_sock on genl_ctrl_resolve error (cdac2f8) - commits - lists.open-mesh.org

1 Dec 2017

Repository : ssh://git@open-mesh.org/batctl
On branch  : master
...

commit cdac2f843c616caaa2a0d3847aeec84c200c62d6
Author: Sven Eckelmann sven.eckelmann@openmesh.com
Date:   Thu Nov 23 15:04:41 2017 +0100
batctl: Free nl_sock on genl_ctrl_resolve error
genl_ctrl_resolve may return NULL on errors. The code must then free the
    socket which was used to start the genl_ctrl_resolve and stop the function
    with an error code.
Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs")
    Signed-off-by: Sven Eckelmann sven.eckelmann@openmesh.com
    Signed-off-by: Simon Wunderlich sw@simonwunderlich.de
...

cdac2f843c616caaa2a0d3847aeec84c200c62d6
 netlink.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/netlink.c b/netlink.c
index b95063a..de81d08 100644
--- a/netlink.c
+++ b/netlink.c
@@ -301,8 +301,10 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header)
    genl_connect(sock);
family = genl_ctrl_resolve(sock, BATADV_NL_NAME);
-	if (family < 0)
+	if (family < 0) {
+		nl_socket_free(sock);
    	return NULL;
+	}
msg = nlmsg_alloc();
    if (!msg) {
@@ -410,8 +412,10 @@ int netlink_print_routing_algos(void)
    genl_connect(sock);
family = genl_ctrl_resolve(sock, BATADV_NL_NAME);
-	if (family < 0)
-		return -EOPNOTSUPP;
+	if (family < 0) {
+		last_err = -EOPNOTSUPP;
+		goto err_free_sock;
+	}
msg = nlmsg_alloc();
    if (!msg) {
@@ -1125,8 +1129,10 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface,
    genl_connect(sock);
family = genl_ctrl_resolve(sock, BATADV_NL_NAME);
-	if (family < 0)
-		return -EOPNOTSUPP;
+	if (family < 0) {
+		last_err = -EOPNOTSUPP;
+		goto err_free_sock;
+	}
ifindex = if_nametoindex(mesh_iface);
    if (!ifindex) {

    