proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 15:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

netlink_open: close socket on error

Browse Source 
All uses of netlink_open() assume that on error the
nl_handler doesn't need to be closed, but some error cases
happen after the socket was opened successfully and used to
simply return -errno.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2016-04-06 10:56:04 +02:00
parent 5c218031b6
commit b73e5969ae
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lxc/nl.c
View File

@ -265,6 +265,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
socklen_t socklen;
int sndbuf = 32768;
int rcvbuf = 32768;
int err;
memset(handler, 0, sizeof(*handler));
@ -274,11 +275,11 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
if (setsockopt(handler->fd, SOL_SOCKET, SO_SNDBUF,
&sndbuf, sizeof(sndbuf)) < 0)
return -errno;
goto err_with_errno;
if (setsockopt(handler->fd, SOL_SOCKET, SO_RCVBUF,
&rcvbuf,sizeof(rcvbuf)) < 0)
return -errno;
goto err_with_errno;
memset(&handler->local, 0, sizeof(handler->local));
handler->local.nl_family = AF_NETLINK;
@ -286,22 +287,31 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
if (bind(handler->fd, (struct sockaddr*)&handler->local,
sizeof(handler->local)) < 0)
return -errno;
goto err_with_errno;
socklen = sizeof(handler->local);
if (getsockname(handler->fd, (struct sockaddr*)&handler->local,
&socklen) < 0)
return -errno;
goto err_with_errno;
if (socklen != sizeof(handler->local))
return -EINVAL;
if (socklen != sizeof(handler->local)) {
err = -EINVAL;
goto errclose;
}
if (handler->local.nl_family != AF_NETLINK)
return -EINVAL;
if (handler->local.nl_family != AF_NETLINK) {
err = -EINVAL;
goto errclose;
}
handler->seq = time(NULL);
return 0;
err_with_errno:
err = -errno;
errclose:
close(handler->fd);
return err;
}
extern int netlink_close(struct nl_handler *handler)