stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix leak of cb if nl_socket_alloc_cb() failed to allocate socket

Browse source 
- each *_get() should have corresponding *_put(). That rule was broken in nl_socket_alloc()
- Also, check if cb is NULL in nl_socket_set_cb (calls BUG())
This commit is contained in:
Коренберг Марк (дома) 2013-04-28 00:35:37 +06:00
parent 59db7fb35b
commit 33396faca5
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/socket.c
View file

@ -120,7 +120,7 @@ static struct nl_sock *__alloc_socket(struct nl_cb *cb)
return NULL;
sk->s_fd = -1;
sk->s_cb = cb;
sk->s_cb = nl_cb_get(cb);
sk->s_local.nl_family = AF_NETLINK;
sk->s_peer.nl_family = AF_NETLINK;
sk->s_seq_expect = sk->s_seq_next = time(0);
@ -141,12 +141,18 @@ static struct nl_sock *__alloc_socket(struct nl_cb *cb)
struct nl_sock *nl_socket_alloc(void)
{
struct nl_cb *cb;
struct nl_sock *sk;
cb = nl_cb_alloc(default_cb);
if (!cb)
return NULL;
return __alloc_socket(cb);
/* will increment cb reference count on success */
sk = __alloc_socket(cb);
nl_cb_put(cb);
return sk;
}
/**
@ -163,7 +169,7 @@ struct nl_sock *nl_socket_alloc_cb(struct nl_cb *cb)
if (cb == NULL)
BUG();
return __alloc_socket(nl_cb_get(cb));
return __alloc_socket(cb);
}
/**
@ -519,6 +525,9 @@ struct nl_cb *nl_socket_get_cb(const struct nl_sock *sk)
void nl_socket_set_cb(struct nl_sock *sk, struct nl_cb *cb)
{
if (cb == NULL)
BUG();
nl_cb_put(sk->s_cb);
sk->s_cb = nl_cb_get(cb);
}