emo
/
ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use {O,SOCK}_CLOEXEC more consistently.

This commit is contained in:
Nicholas J. Kain 2022-08-13 00:42:27 -04:00
parent 867b70e83e
commit e223b4c5a8
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
duiaid.c
View File

@ -42,7 +42,7 @@ static int open_duidfile_read(void)
{ {
char duidfile[PATH_MAX]; char duidfile[PATH_MAX];
get_duid_path(duidfile, sizeof duidfile); get_duid_path(duidfile, sizeof duidfile);
int fd = open(duidfile, O_RDONLY, 0); int fd = open(duidfile, O_RDONLY|O_CLOEXEC, 0);
if (fd < 0) { if (fd < 0) {
log_line("Failed to open duidfile '%s' for reading: %s", log_line("Failed to open duidfile '%s' for reading: %s",
duidfile, strerror(errno)); duidfile, strerror(errno));
@ -54,7 +54,7 @@ static int open_duidfile_write(void)
{ {
char duidfile[PATH_MAX]; char duidfile[PATH_MAX];
get_duid_path(duidfile, sizeof duidfile); get_duid_path(duidfile, sizeof duidfile);
int fd = open(duidfile, O_WRONLY|O_TRUNC|O_CREAT, 0644); int fd = open(duidfile, O_WRONLY|O_TRUNC|O_CREAT|O_CLOEXEC, 0644);
if (fd < 0) if (fd < 0)
suicide("Failed to open duidfile '%s' for writing: %s", suicide("Failed to open duidfile '%s' for writing: %s",
duidfile, strerror(errno)); duidfile, strerror(errno));
@ -65,7 +65,7 @@ static int open_iaidfile_read(const uint8_t hwaddr[static 6], size_t hwaddrlen)
{ {
char iaidfile[PATH_MAX]; char iaidfile[PATH_MAX];
get_iaid_path(iaidfile, sizeof iaidfile, hwaddr, hwaddrlen); get_iaid_path(iaidfile, sizeof iaidfile, hwaddr, hwaddrlen);
int fd = open(iaidfile, O_RDONLY, 0); int fd = open(iaidfile, O_RDONLY|O_CLOEXEC, 0);
if (fd < 0) { if (fd < 0) {
log_line("Failed to open iaidfile '%s' for reading: %s", log_line("Failed to open iaidfile '%s' for reading: %s",
iaidfile, strerror(errno)); iaidfile, strerror(errno));
@ -78,7 +78,7 @@ static int open_iaidfile_write(const uint8_t hwaddr[static 6],
{ {
char iaidfile[PATH_MAX]; char iaidfile[PATH_MAX];
get_iaid_path(iaidfile, sizeof iaidfile, hwaddr, hwaddrlen); get_iaid_path(iaidfile, sizeof iaidfile, hwaddr, hwaddrlen);
int fd = open(iaidfile, O_WRONLY|O_TRUNC|O_CREAT, 0644); int fd = open(iaidfile, O_WRONLY|O_TRUNC|O_CREAT|O_CLOEXEC, 0644);
if (fd < 0) if (fd < 0)
suicide("Failed to open iaidfile '%s' for writing: %s", suicide("Failed to open iaidfile '%s' for writing: %s",
iaidfile, strerror(errno)); iaidfile, strerror(errno));

10
ifset.c
View File

@ -305,7 +305,7 @@ int perform_carrier(void)
{ {
int ret = -1; int ret = -1;
uint32_t flags; uint32_t flags;
int fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK, NETLINK_ROUTE); int fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC, NETLINK_ROUTE);
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) netlink socket open failed: %s", log_line("%s: (%s) netlink socket open failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));
@ -472,7 +472,7 @@ static ssize_t rtnl_if_mtu_set(int fd, unsigned int mtu)
int perform_ifup(void) int perform_ifup(void)
{ {
int fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK, NETLINK_ROUTE); int fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC, NETLINK_ROUTE);
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) netlink socket open failed: %s", log_line("%s: (%s) netlink socket open failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));
@ -525,7 +525,7 @@ int perform_ip_subnet_bcast(const char *str_ipaddr,
bcast.s_addr = ipaddr.s_addr | htonl(0xfffffffflu >> prefixlen); bcast.s_addr = ipaddr.s_addr | htonl(0xfffffffflu >> prefixlen);
} }
fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK, NETLINK_ROUTE); fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC, NETLINK_ROUTE);
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) netlink socket open failed: %s", log_line("%s: (%s) netlink socket open failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));
@ -587,7 +587,7 @@ int perform_router(const char *str_router, size_t len)
goto fail; goto fail;
} }
int fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK, NETLINK_ROUTE); int fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC, NETLINK_ROUTE);
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) netlink socket open failed: %s", log_line("%s: (%s) netlink socket open failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));
@ -640,7 +640,7 @@ int perform_mtu(const char *str, size_t len)
} }
mtu = (unsigned int)tmtu; mtu = (unsigned int)tmtu;
fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK, NETLINK_ROUTE); fd = socket(AF_NETLINK, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC, NETLINK_ROUTE);
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) netlink socket open failed: %s", log_line("%s: (%s) netlink socket open failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));

2
leasefile.c
View File

@ -34,7 +34,7 @@ void open_leasefile(void)
{ {
char leasefile[PATH_MAX]; char leasefile[PATH_MAX];
get_leasefile_path(leasefile, sizeof leasefile, client_config.interface); get_leasefile_path(leasefile, sizeof leasefile, client_config.interface);
leasefilefd = open(leasefile, O_WRONLY|O_TRUNC|O_CREAT, 0644); leasefilefd = open(leasefile, O_WRONLY|O_TRUNC|O_CREAT|O_CLOEXEC, 0644);
if (leasefilefd < 0) if (leasefilefd < 0)
suicide("%s: (%s) Failed to create lease file '%s': %s", suicide("%s: (%s) Failed to create lease file '%s': %s",
client_config.interface, __func__, leasefile, strerror(errno)); client_config.interface, __func__, leasefile, strerror(errno));

2
netlink.c
View File

@ -138,7 +138,7 @@ static int handle_getifdata(int fd, uint32_t seq)
int nl_getifdata(void) int nl_getifdata(void)
{ {
int ret = -1; int ret = -1;
int fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); int fd = socket(AF_NETLINK, SOCK_DGRAM|SOCK_CLOEXEC, NETLINK_ROUTE);
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) netlink socket open failed: %s", log_line("%s: (%s) netlink socket open failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));

2
nk/hwrng.c
View File

@ -78,7 +78,7 @@ static bool nk_get_rnd_clk(char *seed, size_t len)
static bool nk_get_urandom(char *seed, size_t len) static bool nk_get_urandom(char *seed, size_t len)
{ {
int fd = open("/dev/urandom", O_RDONLY); int fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
log_line("%s: Could not open /dev/urandom: %s", __func__, log_line("%s: Could not open /dev/urandom: %s", __func__,
strerror(errno)); strerror(errno));

6
sockd.c
View File

@ -85,7 +85,7 @@ int request_sockd_fd(char *buf, size_t buflen, char *response)
static int create_arp_socket(void) static int create_arp_socket(void)
{ {
int fd = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_ARP)); int fd = socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK | SOCK_CLOEXEC, htons(ETH_P_ARP));
if (fd < 0) { if (fd < 0) {
log_line("%s: (%s) socket failed: %s", client_config.interface, log_line("%s: (%s) socket failed: %s", client_config.interface,
__func__, strerror(errno)); __func__, strerror(errno));
@ -124,7 +124,7 @@ static int create_arp_socket(void)
static int create_udp_socket(uint32_t ip, uint16_t port, char *iface) static int create_udp_socket(uint32_t ip, uint16_t port, char *iface)
{ {
int fd; int fd;
if ((fd = socket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP)) < 0) { if ((fd = socket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC, IPPROTO_UDP)) < 0) {
log_line("%s: (%s) socket failed: %s", log_line("%s: (%s) socket failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));
goto out; goto out;
@ -180,7 +180,7 @@ static int create_raw_socket(struct sockaddr_ll *sa, bool *using_bpf,
const struct sock_fprog *filter_prog) const struct sock_fprog *filter_prog)
{ {
int fd; int fd;
if ((fd = socket(AF_PACKET, SOCK_DGRAM | SOCK_NONBLOCK, if ((fd = socket(AF_PACKET, SOCK_DGRAM | SOCK_NONBLOCK | SOCK_CLOEXEC,
htons(ETH_P_IP))) < 0) { htons(ETH_P_IP))) < 0) {
log_line("create_raw_socket: socket failed: %s", strerror(errno)); log_line("create_raw_socket: socket failed: %s", strerror(errno));
goto out; goto out;