colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: introduce nm_close()

Browse Source 
nm_close() is like close(), but throws an assertion if the input fd is
>=0 and invalid. Passing an invalid (i.e. already closed) fd to
close() is a programming error with potentially catastrophic effects,
as another thread may reuse the closed fd.
This commit is contained in:
Beniamino Galvani
2017-10-18 11:14:36 +02:00
parent 0a7b08968d
commit 1bc1809e11
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
shared/nm-utils/nm-macros-internal.h
View File

@@ -59,6 +59,8 @@
#define nm_auto(fcn) __attribute__ ((cleanup(fcn))) #define nm_auto(fcn) __attribute__ ((cleanup(fcn)))
static inline int nm_close (int fd);
/** /**
* nm_auto_free: * nm_auto_free:
* *
@@ -96,7 +98,7 @@ _nm_auto_close_impl (int *pfd)
if (*pfd >= 0) { if (*pfd >= 0) {
int errsv = errno; int errsv = errno;
(void) close (*pfd); (void) nm_close (*pfd);
errno = errsv; errno = errsv;
} }
} }
@@ -1149,4 +1151,22 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro)
/*****************************************************************************/ /*****************************************************************************/
/**
* nm_close:
*
* Like close() but throws an assertion if the input fd is
* invalid. Closing an invalid fd is a programming error, so
* it's better to catch it early.
*/
static inline int
nm_close (int fd)
{
if (fd >= 0) {
if (close (fd) == 0)
return 0;
nm_assert (errno != EBADF);
}
return -1;
}
#endif /* __NM_MACROS_INTERNAL_H__ */ #endif /* __NM_MACROS_INTERNAL_H__ */