lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
1998-07-21 16:08 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* sysdeps/unix/sysv/linux/sendmsg.c: If passing a SCM_CREDS
	message, copy the buffer and resize it to what the kernel
	wants to see.  Bug found and analyzed by Thorsten Kukuk
	<kukuk@weber-eb.uni-paderborn.de>
This commit is contained in:
Ulrich Drepper
1998-07-21 13:58:40 +00:00
parent 2b25f93f7a
commit c13de8877b
2 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
1998-07-21 16:08 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* sysdeps/unix/sysv/linux/sendmsg.c: If passing a SCM_CREDS
message, copy the buffer and resize it to what the kernel
wants to see. Bug found and analyzed by Thorsten Kukuk
<kukuk@weber-eb.uni-paderborn.de>
1998-07-20 Jose M. Moya <josem@gnu.org> 1998-07-20 Jose M. Moya <josem@gnu.org>
* hurd/hurdmsg.c (_S_msg_get_env_variable): Copy getenv return * hurd/hurdmsg.c (_S_msg_get_env_variable): Copy getenv return

74
sysdeps/unix/sysv/linux/sendmsg.c
View File

@ -18,6 +18,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <asm/posix_types.h> #include <asm/posix_types.h>
@ -25,13 +27,25 @@
/* The kernel expects this structure in SCM_CREDS messages. /* The kernel expects this structure in SCM_CREDS messages.
* Note: sizeof(struct __kernel_ucred) <= sizeof(struct cmsgcred) must hold. * Note: sizeof(struct __kernel_ucred) <= sizeof(struct cmsgcred) must hold.
*/ */
struct __kernel_ucred struct kernel_ucred
{ {
__kernel_pid_t pid; __kernel_pid_t pid;
__kernel_uid_t uid; __kernel_uid_t uid;
__kernel_gid_t gid; __kernel_gid_t gid;
}; };
struct credmsg
{
struct cmsghdr cm;
struct cmsgcred cc;
};
struct kcredmsg
{
struct cmsghdr cm;
struct kernel_ucred cc;
};
extern int __syscall_sendmsg (int, const struct msghdr *, int); extern int __syscall_sendmsg (int, const struct msghdr *, int);
/* Send a message described by MESSAGE on socket FD. /* Send a message described by MESSAGE on socket FD.
@ -39,51 +53,71 @@ extern int __syscall_sendmsg (int, const struct msghdr *, int);
int int
__libc_sendmsg (int fd, const struct msghdr *message, int flags) __libc_sendmsg (int fd, const struct msghdr *message, int flags)
{ {
struct msghdr m;
char *buf, *a, *b;
struct credmsg *cred = 0;
struct kcredmsg *kcred;
struct cmsghdr *cm; struct cmsghdr *cm;
struct cmsgcred *cc; long int offset = 0;
struct __kernel_ucred *u;
pid_t pid; pid_t pid;
/* Preprocess the message control block for SCM_CREDS. */ /* Preprocess the message control block for SCM_CREDS. */
if (message->msg_controllen)
{
cm = CMSG_FIRSTHDR (message); cm = CMSG_FIRSTHDR (message);
while (cm) while (cm)
{ {
if (cm->cmsg_type == SCM_CREDS) if (cm->cmsg_type == SCM_CREDS)
{ {
if (cm->cmsg_len < CMSG_SPACE (sizeof (struct cmsgcred))) if (cred ||
cm->cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)))
{ {
__set_errno (EINVAL); __set_errno (EINVAL);
return -1; return -1;
} }
else
{
cred = (struct credmsg *) cm;
offset = (char *) cm - (char *) message->msg_control;
}
}
cm = CMSG_NXTHDR ((struct msghdr *) message, cm);
}
if (cred)
{
buf = alloca (message->msg_controllen);
memcpy (buf, message->msg_control, message->msg_controllen);
kcred = (struct kcredmsg *) (buf + offset);
a = (char *) kcred + CMSG_LEN (sizeof (struct kernel_ucred));
b = (char *) kcred + CMSG_LEN (sizeof (struct cmsgcred));
memmove (a, b, message->msg_controllen - (b - buf));
kcred->cm.cmsg_len = CMSG_LEN (sizeof (struct kernel_ucred));
u = (struct __kernel_ucred *) CMSG_DATA (cm);
cc = (struct cmsgcred *) CMSG_DATA (cm);
/* Linux expects the calling process to pass in /* Linux expects the calling process to pass in
its credentials, and sanity checks them. its credentials, and sanity checks them.
You can send real, effective, or set- uid and gid. You can send real, effective, or set- uid and gid.
If the user hasn't filled in the buffer, we default to If the user hasn't filled in the buffer, we default to
real uid and gid. */ real uid and gid. */
pid = __getpid (); pid = __getpid ();
if (cc->cmcred_pid != pid) if (cred->cc.cmcred_pid != pid)
{ {
u->pid = pid; kcred->cc.pid = pid;
u->uid = __getuid (); kcred->cc.uid = __getuid ();
u->gid = __getgid (); kcred->cc.gid = __getgid ();
} }
else else
{ {
struct __kernel_ucred v; kcred->cc.uid = cred->cc.cmcred_uid;
v.pid = cc->cmcred_pid; kcred->cc.gid = cred->cc.cmcred_gid;
v.uid = cc->cmcred_uid; }
v.gid = cc->cmcred_gid; memcpy (&m, message, sizeof (struct msghdr));
u->pid = v.pid; m.msg_control = buf;
u->uid = v.uid; m.msg_controllen -= b - a;
u->gid = v.gid; return __syscall_sendmsg (fd, &m, flags);
} }
} }
cm = CMSG_NXTHDR ((struct msghdr *) message, cm);
}
return __syscall_sendmsg (fd, message, flags); return __syscall_sendmsg (fd, message, flags);
} }