libnl_2: Fix memory leaks
BUG: b/5532633
Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/libnl_2/socket.c b/libnl_2/socket.c
index ce54f19..d906cac 100644
--- a/libnl_2/socket.c
+++ b/libnl_2/socket.c
@@ -31,7 +31,7 @@
}
/* Allocate new netlink socket. */
-struct nl_sock *nl_socket_alloc(void)
+static struct nl_sock *_nl_socket_alloc(void)
{
struct nl_sock *sk;
struct timeval tv;
@@ -39,13 +39,13 @@
sk = (struct nl_sock *) malloc(sizeof(struct nl_sock));
if (!sk)
- goto fail;
+ return NULL;
memset(sk, 0, sizeof(*sk));
/* Get current time */
if (gettimeofday(&tv, NULL))
- return NULL;
+ goto fail;
else
sk->s_seq_next = (int) tv.tv_sec;
@@ -59,24 +59,36 @@
sk->s_peer.nl_pid = 0; /* Kernel */
sk->s_peer.nl_groups = 0; /* No groups */
- cb = (struct nl_cb *) malloc(sizeof(struct nl_cb));
+ return sk;
+fail:
+ free(sk);
+ return NULL;
+}
+
+/* Allocate new netlink socket. */
+struct nl_sock *nl_socket_alloc(void)
+{
+ struct nl_sock *sk = _nl_socket_alloc();
+ struct nl_cb *cb;
+
+ if (!sk)
+ return NULL;
+
+ cb = nl_cb_alloc(NL_CB_DEFAULT);
if (!cb)
goto cb_fail;
- memset(cb, 0, sizeof(*cb));
- sk->s_cb = nl_cb_alloc(NL_CB_DEFAULT);
-
-
+ sk->s_cb = cb;
return sk;
cb_fail:
free(sk);
-fail:
return NULL;
}
/* Allocate new socket with custom callbacks. */
struct nl_sock *nl_socket_alloc_cb(struct nl_cb *cb)
{
- struct nl_sock *sk = nl_socket_alloc();
+ struct nl_sock *sk = _nl_socket_alloc();
+
if (!sk)
return NULL;
@@ -84,7 +96,6 @@
nl_cb_get(cb);
return sk;
-
}
/* Free a netlink socket. */
@@ -116,5 +127,3 @@
{
return sk->s_fd;
}
-
-