shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 08:26:52 +03:00
Code

sd-dhcp: network - don't leak sockets on failure

Browse Source 
Also some general cleanups
This commit is contained in:
Tom Gundersen 2014-05-06 22:02:32 +02:00
parent 85923f79e1
commit c3d2994b59
2 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/libsystemd-network/dhcp-network.c
View File

@ -32,7 +32,8 @@
#include "dhcp-internal.h"
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t xid) {
int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link,
uint32_t xid) {
struct sock_filter filter[] = {
BPF_STMT(BPF_LD + BPF_W + BPF_LEN, 0), /* A <- packet length */
BPF_JUMP(BPF_JMP + BPF_JGE + BPF_K, sizeof(DHCPPacket), 1, 0), /* packet >= DHCPPacket ? */
@ -66,7 +67,8 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t
.len = ELEMENTSOF(filter),
.filter = filter
};
int s, one = 1;
_cleanup_close_ int s = -1;
int r, one = 1;
assert(index > 0);
assert(link);
@ -75,74 +77,87 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t
if (s < 0)
return -errno;
r = setsockopt (s, SOL_PACKET, PACKET_AUXDATA, &one, sizeof(one));
if (r < 0)
return -errno;
r = setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog));
if (r < 0)
return -errno;
link->ll.sll_family = AF_PACKET;
link->ll.sll_protocol = htons(ETH_P_IP);
link->ll.sll_ifindex = index;
link->ll.sll_halen = ETH_ALEN;
memset(link->ll.sll_addr, 0xff, ETH_ALEN);
if (setsockopt (s, SOL_PACKET, PACKET_AUXDATA, &one, sizeof(one)) < 0)
r = bind(s, &link->sa, sizeof(link->ll));
if (r < 0)
return -errno;
if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog)) < 0) {
return -errno;
}
r = s;
s = -1;
if (bind(s, &link->sa, sizeof(link->ll)) < 0) {
safe_close(s);
return -errno;
}
return s;
return r;
}
int dhcp_network_bind_udp_socket(be32_t address, uint16_t port)
{
int s, tos = IPTOS_CLASS_CS6;
int dhcp_network_bind_udp_socket(be32_t address, uint16_t port) {
union sockaddr_union src = {
.in.sin_family = AF_INET,
.in.sin_port = htobe16(port),
.in.sin_addr.s_addr = address,
};
_cleanup_close_ int s = -1;
int r, tos = IPTOS_CLASS_CS6;
s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
if (s < 0)
return -errno;
if (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
r = setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos));
if (r < 0)
return -errno;
if (bind(s, &src.sa, sizeof(src.in)) < 0) {
safe_close(s);
r = bind(s, &src.sa, sizeof(src.in));
if (r < 0)
return -errno;
}
return s;
r = s;
s = -1;
return r;
}
int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
const void *packet, size_t len)
{
const void *packet, size_t len) {
int r;
assert(link);
assert(packet);
assert(len);
if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
r = sendto(s, packet, len, 0, &link->sa, sizeof(link->ll));
if (r < 0)
return -errno;
return 0;
}
int dhcp_network_send_udp_socket(int s, be32_t address, uint16_t port,
const void *packet, size_t len)
{
const void *packet, size_t len) {
union sockaddr_union dest = {
.in.sin_family = AF_INET,
.in.sin_port = htobe16(port),
.in.sin_addr.s_addr = address,
};
int r;
if (sendto(s, packet, len, 0, &dest.sa, sizeof(dest.in)) < 0)
assert(s >= 0);
assert(packet);
assert(len);
r = sendto(s, packet, len, 0, &dest.sa, sizeof(dest.in));
if (r < 0)
return -errno;
return 0;

22
src/libsystemd-network/ipv4ll-network.c
View File

@ -24,11 +24,14 @@
int arp_network_send_raw_socket(int fd, const union sockaddr_union *link,
const struct ether_arp *arp) {
int r;
assert(arp);
assert(link);
assert(fd >= 0);
if (sendto(fd, arp, sizeof(struct ether_arp), 0, &link->sa, sizeof(link->ll)) < 0)
r = sendto(fd, arp, sizeof(struct ether_arp), 0, &link->sa, sizeof(link->ll));
if (r < 0)
return -errno;
return 0;
@ -56,7 +59,8 @@ int arp_network_bind_raw_socket(int index, union sockaddr_union *link) {
.len = ELEMENTSOF(filter),
.filter = filter
};
int s;
_cleanup_close_ int s = -1;
int r;
assert(index > 0);
assert(link);
@ -65,9 +69,9 @@ int arp_network_bind_raw_socket(int index, union sockaddr_union *link) {
if (s < 0)
return -errno;
if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog)) < 0) {
r = setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog));
if (r < 0)
return -errno;
}
link->ll.sll_family = AF_PACKET;
link->ll.sll_protocol = htons(ETH_P_ARP);
@ -75,10 +79,12 @@ int arp_network_bind_raw_socket(int index, union sockaddr_union *link) {
link->ll.sll_halen = ETH_ALEN;
memset(link->ll.sll_addr, 0xff, ETH_ALEN);
if (bind(s, &link->sa, sizeof(link->ll)) < 0) {
safe_close(s);
r = bind(s, &link->sa, sizeof(link->ll));
if (r < 0)
return -errno;
}
return s;
r = s;
s = -1;
return r;
}