qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hurd: sendto: do not crash when ADDR is null 

Create a new create_address_port subroutine to isolate the address port creation
(for both local and remove sockets), and use it inside HURD_DPORT_USE.
Also intialize APORT to MACH_PORT_NULL and make sure to always deallocate it,
when not null.
This commit is contained in:
Pino Toscano 2012-07-20 23:56:58 +02:00
parent 0f48659e36
commit ac4ea442f3
2 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-07-20 Pino Toscano <toscano.pino@tiscali.it>
* sysdeps/mach/hurd/sendto.c (create_address_port): New subroutine.
(__sendto): Use create_address_port. Initialize APORT and deallocate
it if not null.
2012-07-20 Joseph Myers <joseph@codesourcery.com> 2012-07-20 Joseph Myers <joseph@codesourcery.com>
* elf/Makefile (check-data): Remove. * elf/Makefile (check-data): Remove.

68
sysdeps/mach/hurd/sendto.c
View File

@ -33,37 +33,50 @@ __sendto (int fd,
const struct sockaddr_un *addr, const struct sockaddr_un *addr,
socklen_t addr_len) socklen_t addr_len)
{ {
addr_port_t aport; addr_port_t aport = MACH_PORT_NULL;
error_t err; error_t err;
size_t wrote; size_t wrote;
if (addr->sun_family == AF_LOCAL)
{
/* For the local domain, we must look up the name as a file and talk
to it with the ifsock protocol. */
file_t file = __file_name_lookup (addr->sun_path, 0, 0);
if (file == MACH_PORT_NULL)
return -1;
err = __ifsock_getsockaddr (file, &aport);
__mach_port_deallocate (__mach_task_self (), file);
if (err == MIG_BAD_ID || err == EOPNOTSUPP)
/* The file did not grok the ifsock protocol. */
err = ENOTSOCK;
if (err)
return __hurd_fail (err);
}
else
err = EIEIO;
/* Get an address port for the desired destination address. */ /* Get an address port for the desired destination address. */
error_t create_address_port (io_t port,
const struct sockaddr_un *addr,
socklen_t addr_len,
addr_port_t *aport)
{
error_t err_port;
if (addr->sun_family == AF_LOCAL)
{
/* For the local domain, we must look up the name as a file and talk
to it with the ifsock protocol. */
file_t file = __file_name_lookup (addr->sun_path, 0, 0);
if (file == MACH_PORT_NULL)
return errno;
err_port = __ifsock_getsockaddr (file, aport);
__mach_port_deallocate (__mach_task_self (), file);
if (err_port == MIG_BAD_ID || err_port == EOPNOTSUPP)
/* The file did not grok the ifsock protocol. */
err_port = ENOTSOCK;
}
else
{
err_port = __socket_create_address (port,
addr->sun_family,
(char *) addr,
addr_len,
aport);
}
return err_port;
}
err = HURD_DPORT_USE (fd, err = HURD_DPORT_USE (fd,
({ ({
if (err) if (addr != NULL)
err = __socket_create_address (port, err = create_address_port (port, addr, addr_len,
addr->sun_family, &aport);
(char *) addr, else
addr_len, err = 0;
&aport);
if (! err) if (! err)
{ {
/* Send the data. */ /* Send the data. */
@ -72,12 +85,13 @@ __sendto (int fd,
NULL, NULL,
MACH_MSG_TYPE_COPY_SEND, 0, MACH_MSG_TYPE_COPY_SEND, 0,
NULL, 0, &wrote); NULL, 0, &wrote);
__mach_port_deallocate (__mach_task_self (),
aport);
} }
err; err;
})); }));
if (aport != MACH_PORT_NULL)
__mach_port_deallocate (__mach_task_self (), aport);
return err ? __hurd_sockfail (fd, flags, err) : wrote; return err ? __hurd_sockfail (fd, flags, err) : wrote;
} }