projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Freebsd creds: do not overwrite recv len
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
sessiond-comm.c
diff --git
a/src/common/sessiond-comm/sessiond-comm.c
b/src/common/sessiond-comm/sessiond-comm.c
index 24757f702a2557de7a556afcab4d079e4763ed7f..c2b76f37a0401886cc8b5b8fe8ffd3263b3f83e8 100644
(file)
--- a/
src/common/sessiond-comm/sessiond-comm.c
+++ b/
src/common/sessiond-comm/sessiond-comm.c
@@
-24,7
+24,6
@@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/un.h>
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
@@
-250,10
+249,12
@@
int lttcomm_listen_unix_sock(int sock)
*/
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
{
*/
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
{
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
struct iovec iov[1];
ssize_t ret = -1;
+ memset(&msg, 0, sizeof(msg));
+
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
@@
-274,10
+275,12
@@
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
*/
ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
{
*/
ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
{
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
struct iovec iov[1];
ssize_t ret = -1;
+ memset(&msg, 0, sizeof(msg));
+
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
@@
-304,6
+307,8
@@
int lttcomm_close_unix_sock(int sock)
perror("shutdown");
}
perror("shutdown");
}
+ close(sock);
+
return ret;
}
return ret;
}
@@
-314,7
+319,7
@@
int lttcomm_close_unix_sock(int sock)
*/
ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
{
*/
ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
{
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
@@
-322,6
+327,8
@@
ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
char tmp[CMSG_SPACE(sizeof_fds)];
char dummy = 0;
char tmp[CMSG_SPACE(sizeof_fds)];
char dummy = 0;
+ memset(&msg, 0, sizeof(msg));
+
if (nb_fd > LTTCOMM_MAX_SEND_FDS)
return -EINVAL;
if (nb_fd > LTTCOMM_MAX_SEND_FDS)
return -EINVAL;
@@
-363,9
+370,11
@@
ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
struct cmsghdr *cmsg;
size_t sizeof_fds = nb_fd * sizeof(int);
char recv_fd[CMSG_SPACE(sizeof_fds)];
struct cmsghdr *cmsg;
size_t sizeof_fds = nb_fd * sizeof(int);
char recv_fd[CMSG_SPACE(sizeof_fds)];
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
char dummy;
char dummy;
+ memset(&msg, 0, sizeof(msg));
+
/* Prepare to receive the structures */
iov[0].iov_base = &dummy;
iov[0].iov_len = 1;
/* Prepare to receive the structures */
iov[0].iov_base = &dummy;
iov[0].iov_len = 1;
@@
-402,7
+411,7
@@
ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
}
if (cmsg->cmsg_len != CMSG_LEN(sizeof_fds)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
}
if (cmsg->cmsg_len != CMSG_LEN(sizeof_fds)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
-
cmsg->cmsg_len,
CMSG_LEN(sizeof_fds));
+
(size_t) cmsg->cmsg_len, (size_t)
CMSG_LEN(sizeof_fds));
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-419,32
+428,38
@@
end:
*/
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
{
*/
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
{
- struct msghdr msg = { 0 };
- struct cmsghdr *cmptr;
+ struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
struct iovec iov[1];
ssize_t ret = -1;
- struct ucred *creds;
- size_t sizeof_cred = sizeof(struct ucred);
+#ifdef __linux__
+ struct cmsghdr *cmptr;
+ size_t sizeof_cred = sizeof(lttng_sock_cred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
char anc_buf[CMSG_SPACE(sizeof_cred)];
+ lttng_sock_cred *creds;
+#endif /* __linux__ */
+
+ memset(&msg, 0, sizeof(msg));
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
+#ifdef __linux__
msg.msg_control = (caddr_t) anc_buf;
msg.msg_controllen = CMSG_LEN(sizeof_cred);
cmptr = CMSG_FIRSTHDR(&msg);
cmptr->cmsg_level = SOL_SOCKET;
msg.msg_control = (caddr_t) anc_buf;
msg.msg_controllen = CMSG_LEN(sizeof_cred);
cmptr = CMSG_FIRSTHDR(&msg);
cmptr->cmsg_level = SOL_SOCKET;
- cmptr->cmsg_type =
SCM_CREDENTIAL
S;
+ cmptr->cmsg_type =
LTTNG_SOCK_CRED
S;
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
cmptr->cmsg_len = CMSG_LEN(sizeof_cred);
- creds = (
struct ucred
*) CMSG_DATA(cmptr);
+ creds = (
lttng_sock_cred
*) CMSG_DATA(cmptr);
- creds->uid = geteuid();
- creds->gid = getegid();
- creds->pid = getpid();
+ LTTNG_SOCK_SET_UID_CRED(creds, geteuid());
+ LTTNG_SOCK_SET_GID_CRED(creds, getegid());
+ LTTNG_SOCK_SET_PID_CRED(creds, getpid());
+#endif /* __linux__ */
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
ret = sendmsg(sock, &msg, 0);
if (ret < 0) {
@@
-460,14
+475,18
@@
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
* Returns the size of received data, or negative error value.
*/
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
* Returns the size of received data, or negative error value.
*/
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
-
struct u
cred *creds)
+
lttng_sock_
cred *creds)
{
{
- struct msghdr msg = { 0 };
- struct cmsghdr *cmptr;
+ struct msghdr msg;
struct iovec iov[1];
ssize_t ret;
struct iovec iov[1];
ssize_t ret;
- size_t sizeof_cred = sizeof(struct ucred);
+#ifdef __linux__
+ struct cmsghdr *cmptr;
+ size_t sizeof_cred = sizeof(lttng_sock_cred);
char anc_buf[CMSG_SPACE(sizeof_cred)];
char anc_buf[CMSG_SPACE(sizeof_cred)];
+#endif /* __linux__ */
+
+ memset(&msg, 0, sizeof(msg));
/* Not allowed */
if (creds == NULL) {
/* Not allowed */
if (creds == NULL) {
@@
-481,8
+500,10
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
+#ifdef __linux__
msg.msg_control = anc_buf;
msg.msg_controllen = sizeof(anc_buf);
msg.msg_control = anc_buf;
msg.msg_controllen = sizeof(anc_buf);
+#endif /* __linux__ */
ret = recvmsg(sock, &msg, 0);
if (ret < 0) {
ret = recvmsg(sock, &msg, 0);
if (ret < 0) {
@@
-490,6
+511,7
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
goto end;
}
goto end;
}
+#ifdef __linux__
if (msg.msg_flags & MSG_CTRUNC) {
fprintf(stderr, "Error: Control message truncated.\n");
ret = -1;
if (msg.msg_flags & MSG_CTRUNC) {
fprintf(stderr, "Error: Control message truncated.\n");
ret = -1;
@@
-504,7
+526,7
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
}
if (cmptr->cmsg_level != SOL_SOCKET ||
}
if (cmptr->cmsg_level != SOL_SOCKET ||
- cmptr->cmsg_type !=
SCM_CREDENTIAL
S) {
+ cmptr->cmsg_type !=
LTTNG_SOCK_CRED
S) {
fprintf(stderr, "Didn't received any credentials\n");
ret = -1;
goto end;
fprintf(stderr, "Didn't received any credentials\n");
ret = -1;
goto end;
@@
-512,12
+534,23
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
if (cmptr->cmsg_len != CMSG_LEN(sizeof_cred)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
if (cmptr->cmsg_len != CMSG_LEN(sizeof_cred)) {
fprintf(stderr, "Error: Received %zu bytes of ancillary data, expected %zu\n",
-
cmptr->cmsg_len,
CMSG_LEN(sizeof_cred));
+
(size_t) cmptr->cmsg_len, (size_t)
CMSG_LEN(sizeof_cred));
ret = -1;
goto end;
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
ret = -1;
goto end;
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
+#elif defined(__FreeBSD__)
+ {
+ int peer_ret;
+
+ peer_ret = getpeereid(sock, &creds->uid, &creds->gid);
+ if (peer_ret != 0) {
+ return peer_ret;
+ }
+#else
+#error "Please implement credential support for your OS."
+#endif /* __linux__ */
end:
return ret;
end:
return ret;
@@
-526,6
+559,7
@@
end:
/*
* Set socket option to use credentials passing.
*/
/*
* Set socket option to use credentials passing.
*/
+#ifdef __linux__
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
int ret, on = 1;
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
int ret, on = 1;
@@
-535,6
+569,13
@@
int lttcomm_setsockopt_creds_unix_sock(int sock)
if (ret < 0) {
perror("setsockopt creds unix sock");
}
if (ret < 0) {
perror("setsockopt creds unix sock");
}
-
return ret;
}
return ret;
}
+#elif defined(__FreeBSD__)
+int lttcomm_setsockopt_creds_unix_sock(int sock)
+{
+ return 0;
+}
+#else
+#error "Please implement credential support for your OS."
+#endif /* __linux__ */
This page took
0.026397 seconds
and
4
git commands to generate.