* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#include <limits.h>
LTTNG_HIDDEN
int lttcomm_connect_unix_sock(const char *pathname)
{
- struct sockaddr_un sun;
+ struct sockaddr_un s_un;
int fd, ret, closeret;
fd = socket(PF_UNIX, SOCK_STREAM, 0);
goto error;
}
- memset(&sun, 0, sizeof(sun));
- sun.sun_family = AF_UNIX;
- strncpy(sun.sun_path, pathname, sizeof(sun.sun_path));
- sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+ memset(&s_un, 0, sizeof(s_un));
+ s_un.sun_family = AF_UNIX;
+ strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path));
+ s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0';
- ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun));
+ ret = connect(fd, (struct sockaddr *) &s_un, sizeof(s_un));
if (ret < 0) {
/*
* Don't print message on connect error, because connect is used in
int lttcomm_accept_unix_sock(int sock)
{
int new_fd;
- struct sockaddr_un sun;
+ struct sockaddr_un s_un;
socklen_t len = 0;
/* Blocking call */
- new_fd = accept(sock, (struct sockaddr *) &sun, &len);
+ new_fd = accept(sock, (struct sockaddr *) &s_un, &len);
if (new_fd < 0) {
PERROR("accept");
}
LTTNG_HIDDEN
int lttcomm_create_unix_sock(const char *pathname)
{
- struct sockaddr_un sun;
+ struct sockaddr_un s_un;
int fd;
int ret = -1;
goto error;
}
- memset(&sun, 0, sizeof(sun));
- sun.sun_family = AF_UNIX;
- strncpy(sun.sun_path, pathname, sizeof(sun.sun_path));
- sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+ memset(&s_un, 0, sizeof(s_un));
+ s_un.sun_family = AF_UNIX;
+ strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path));
+ s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0';
/* Unlink the old file if present */
(void) unlink(pathname);
- ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
+ ret = bind(fd, (struct sockaddr *) &s_un, sizeof(s_un));
if (ret < 0) {
PERROR("bind");
goto error;
msg.msg_controllen = CMSG_LEN(sizeof_fds);
cmptr = CMSG_FIRSTHDR(&msg);
+ if (!cmptr) {
+ return -1;
+ }
cmptr->cmsg_level = SOL_SOCKET;
cmptr->cmsg_type = SCM_RIGHTS;
cmptr->cmsg_len = CMSG_LEN(sizeof_fds);
size_t sizeof_cred = sizeof(lttng_sock_cred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
lttng_sock_cred *creds;
+
+ memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char));
#endif /* __linux__ */
memset(&msg, 0, sizeof(msg));
- memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char));
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_controllen = CMSG_LEN(sizeof_cred);
cmptr = CMSG_FIRSTHDR(&msg);
+ if (!cmptr) {
+ return -1;
+ }
cmptr->cmsg_level = SOL_SOCKET;
cmptr->cmsg_type = LTTNG_SOCK_CREDS;
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);