X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fsocket.h;h=3690ba6797c7c0c811a62ea4d1541eef0263e571;hp=dcb6cdede757b3f43238b8ffaffeaf11fa17f3ff;hb=de559cf1823ecaf083c7c827c926b3aece32df71;hpb=b17231c6950cb1c05d18cd005e7397e4c7fc763a diff --git a/src/common/compat/socket.h b/src/common/compat/socket.h index dcb6cdede..3690ba679 100644 --- a/src/common/compat/socket.h +++ b/src/common/compat/socket.h @@ -1,18 +1,8 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; only version 2 of the License. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _COMPAT_SOCKET_H @@ -23,33 +13,176 @@ #include +#ifndef MSG_NOSIGNAL +# ifdef SO_NOSIGPIPE +# define MSG_NOSIGNAL SO_NOSIGPIPE +# endif +#endif + +#if defined(MSG_NOSIGNAL) +static inline +ssize_t lttng_recvmsg_nosigpipe(int sockfd, struct msghdr *msg) +{ + return recvmsg(sockfd, msg, MSG_NOSIGNAL); +} +#else + +#include +#include + +static inline +ssize_t lttng_recvmsg_nosigpipe(int sockfd, struct msghdr *msg) +{ + ssize_t received; + int saved_err; + sigset_t sigpipe_set, pending_set, old_set; + int sigpipe_was_pending; + + /* + * Discard the SIGPIPE from send(), not disturbing any SIGPIPE + * that might be already pending. If a bogus SIGPIPE is sent to + * the entire process concurrently by a malicious user, it may + * be simply discarded. + */ + if (sigemptyset(&pending_set)) { + return -1; + } + /* + * sigpending returns the mask of signals that are _both_ + * blocked for the thread _and_ pending for either the thread or + * the entire process. + */ + if (sigpending(&pending_set)) { + return -1; + } + sigpipe_was_pending = sigismember(&pending_set, SIGPIPE); + /* + * If sigpipe was pending, it means it was already blocked, so + * no need to block it. + */ + if (!sigpipe_was_pending) { + if (sigemptyset(&sigpipe_set)) { + return -1; + } + if (sigaddset(&sigpipe_set, SIGPIPE)) { + return -1; + } + if (pthread_sigmask(SIG_BLOCK, &sigpipe_set, &old_set)) { + return -1; + } + } + + /* Send and save errno. */ + received = recvmsg(sockfd, msg, 0); + saved_err = errno; + + if (received == -1 && errno == EPIPE && !sigpipe_was_pending) { + struct timespec timeout = { 0, 0 }; + int ret; + + do { + ret = sigtimedwait(&sigpipe_set, NULL, + &timeout); + } while (ret == -1 && errno == EINTR); + } + if (!sigpipe_was_pending) { + if (pthread_sigmask(SIG_SETMASK, &old_set, NULL)) { + return -1; + } + } + /* Restore send() errno */ + errno = saved_err; + + return received; +} +#endif + + #ifdef __linux__ #define LTTNG_SOCK_CREDS SCM_CREDENTIALS -#define LTTNG_SOCK_FDS SCM_RIGHTS typedef struct ucred lttng_sock_cred; -#define LTTNG_SOCK_SET_UID_CRED(c, u) LTTNG_REF(c)->uid = u; -#define LTTNG_SOCK_SET_GID_CRED(c, g) LTTNG_REF(c)->gid = g; -#define LTTNG_SOCK_SET_PID_CRED(c, p) LTTNG_REF(c)->pid = p; +#define LTTNG_SOCK_SET_UID_CRED(c, u) LTTNG_REF(c)->uid = u +#define LTTNG_SOCK_SET_GID_CRED(c, g) LTTNG_REF(c)->gid = g +#define LTTNG_SOCK_SET_PID_CRED(c, p) LTTNG_REF(c)->pid = p -#elif __FreeBSD__ +#define LTTNG_SOCK_GET_UID_CRED(c) LTTNG_REF(c)->uid +#define LTTNG_SOCK_GET_GID_CRED(c) LTTNG_REF(c)->gid +#define LTTNG_SOCK_GET_PID_CRED(c) LTTNG_REF(c)->pid -#undef SO_PASSCRED -#define SO_PASSCRED 0 +#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__)) -#define LTTNG_SOCK_CREDS SCM_CREDS -#define LTTNG_SOCK_FDS SCM_RIGHTS +struct lttng_sock_cred { + uid_t uid; + gid_t gid; +}; -typedef struct cmsgcred lttng_sock_cred; +typedef struct lttng_sock_cred lttng_sock_cred; -#define LTTNG_SOCK_SET_UID_CRED(c, uid) LTTNG_REF(c)->cmcred_uid = uid; -#define LTTNG_SOCK_SET_GID_CRED(c, gid) LTTNG_REF(c)->cmcred_gid = gid; -#define LTTNG_SOCK_SET_PID_CRED(c, pid) LTTNG_REF(c)->cmcred_pid = pid; +#define LTTNG_SOCK_SET_UID_CRED(c, u) LTTNG_REF(c)->uid = u +#define LTTNG_SOCK_SET_GID_CRED(c, g) LTTNG_REF(c)->gid = g +#define LTTNG_SOCK_SET_PID_CRED(c, p) + +#define LTTNG_SOCK_GET_UID_CRED(c) LTTNG_REF(c)->uid +#define LTTNG_SOCK_GET_GID_CRED(c) LTTNG_REF(c)->gid +#define LTTNG_SOCK_GET_PID_CRED(c) -1 #else -#error "Please add support for your OS into lttng/ust-endian.h." +#error "Please add support for your OS." #endif /* __linux__ , __FreeBSD__ */ + +#ifdef __sun__ + +# ifndef CMSG_ALIGN +# ifdef _CMSG_DATA_ALIGN +# define CMSG_ALIGN(len) _CMSG_DATA_ALIGN(len) +# else + /* aligning to sizeof (long) is assumed to be portable (fd.o#40235) */ +# define CMSG_ALIGN(len) (((len) + sizeof (long) - 1) & ~(sizeof (long) - 1)) +# endif +# ifndef CMSG_SPACE +# define CMSG_SPACE(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + CMSG_ALIGN (len)) +# endif +# ifndef CMSG_LEN +# define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len)) +# endif +# endif + + +#include + +static inline +int getpeereid(int s, uid_t *euid, gid_t *gid) +{ + int ret = 0; + ucred_t *ucred = NULL; + + ret = getpeerucred(s, &ucred); + if (ret == -1) { + goto end; + } + + ret = ucred_geteuid(ucred); + if (ret == -1) { + goto free; + } + *euid = ret; + + ret = ucred_getrgid(ucred); + if (ret == -1) { + goto free; + } + *gid = ret; + ret = 0; +free: + ucred_free(ucred); +end: + return ret; +} + +#endif /* __sun__ */ + #endif /* _COMPAT_SOCKET_H */