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

lib/socket: use proper typed constant UINT32_MAX for uint32_t typed port

Browse source 
This was a bug on architectures with native int type less then 32 bit.

Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-04-09 12:08:50 +02:00
parent 657e257ec5
commit 0fd510b367
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/socket.c
View file

@ -82,7 +82,7 @@ static uint32_t generate_local_port(void)
nl_write_unlock(&port_map_lock);
return pid + (n << 22);
return pid + (((uint32_t)n) << 22);
}
}
@ -90,14 +90,14 @@ static uint32_t generate_local_port(void)
/* Out of sockets in our own PID namespace, what to do? FIXME */
NL_DBG(1, "Warning: Ran out of unique local port namespace\n");
return UINT_MAX;
return UINT32_MAX;
}
static void release_local_port(uint32_t port)
{
int nr;
if (port == UINT_MAX)
if (port == UINT32_MAX)
return;
nr = port >> 22;
@ -126,7 +126,7 @@ static struct nl_sock *__alloc_socket(struct nl_cb *cb)
sk->s_peer.nl_family = AF_NETLINK;
sk->s_seq_expect = sk->s_seq_next = time(0);
sk->s_local.nl_pid = generate_local_port();
if (sk->s_local.nl_pid == UINT_MAX) {
if (sk->s_local.nl_pid == UINT32_MAX) {
nl_socket_free(sk);
return NULL;
}