mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 15:00:06 +00:00
a3708cf6b0
This patch is split out of <https://sourceware.org/pipermail/libc-alpha/2022-December/144122.html>. atoi has undefined behavior on out-of-range input, which makes it problematic to use anywhere in glibc that might be processing input out-of-range for atoi but not specified to produce undefined behavior for the function calling atoi. Change some uses of atoi to call strtol instead; this avoids the undefined behavior, though there is no guarantee that the overflow handling of strtol is really right in those places either. This also serves to avoid localplt test failures given an installed header redirection for strtol (which means that the call from the inline atoi implementation doesn't end up at a hidden alias from libc_hidden_proto). Certainly, the use of atoi is questionable in argp-help.c (shared with gnulib, so shouldn't depend on glibc implementation details, and processing user-provided input), and maybe also in argp-parse.c (I'm not sure what that code in argp-parse.c is meant to be used for). I also changed inet/rexec.c and resolv/res_init.c similarly to use strtol to avoid such localplt failures, although given those files (in those versions) are only used in glibc it's not problematic for them to rely on the specific behavior of glibc's atoi on out-of-range input (in the absence of compiler optimizations based on the undefined behavior) in the same way it's problematic for gnulib code to do so. There may be other uses of atoi (or atol or atoll), in any of glibc's installed code, for which it would also be appropriate to avoid the undefined behavior on out-of-range input; this patch only fixes the specific cases needed to avoid localplt failures. Tested for x86_64.
199 lines
5.2 KiB
C
199 lines
5.2 KiB
C
/*
|
|
* Copyright (c) 1980, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <alloca.h>
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/uio.h>
|
|
|
|
int rexecoptions;
|
|
libc_freeres_ptr (static char *ahostbuf);
|
|
|
|
int
|
|
rexec_af (char **ahost, int rport, const char *name, const char *pass,
|
|
const char *cmd, int *fd2p, sa_family_t af)
|
|
{
|
|
struct sockaddr_storage from;
|
|
struct addrinfo hints, *res0;
|
|
const char *orig_name = name;
|
|
const char *orig_pass = pass;
|
|
u_short port = 0;
|
|
int s, timo = 1, s3;
|
|
char c;
|
|
int gai;
|
|
char servbuff[NI_MAXSERV];
|
|
|
|
__snprintf(servbuff, sizeof(servbuff), "%d", ntohs(rport));
|
|
servbuff[sizeof(servbuff) - 1] = '\0';
|
|
|
|
memset(&hints, '\0', sizeof(hints));
|
|
hints.ai_family = af;
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
hints.ai_flags = AI_CANONNAME;
|
|
gai = getaddrinfo(*ahost, servbuff, &hints, &res0);
|
|
if (gai){
|
|
/* XXX: set errno? */
|
|
return -1;
|
|
}
|
|
|
|
if (res0->ai_canonname){
|
|
free (ahostbuf);
|
|
ahostbuf = __strdup (res0->ai_canonname);
|
|
if (ahostbuf == NULL) {
|
|
perror ("rexec: strdup");
|
|
goto bad2;
|
|
}
|
|
*ahost = ahostbuf;
|
|
} else {
|
|
*ahost = NULL;
|
|
__set_errno (ENOENT);
|
|
goto bad2;
|
|
}
|
|
ruserpass(res0->ai_canonname, &name, &pass);
|
|
retry:
|
|
/* NB: No SOCK_CLOEXEC for backwards compatibility. */
|
|
s = __socket(res0->ai_family, res0->ai_socktype, 0);
|
|
if (s < 0) {
|
|
perror("rexec: socket");
|
|
goto bad2;
|
|
}
|
|
if (__connect(s, res0->ai_addr, res0->ai_addrlen) < 0) {
|
|
if (errno == ECONNREFUSED && timo <= 16) {
|
|
(void) __close(s);
|
|
__sleep(timo);
|
|
timo *= 2;
|
|
goto retry;
|
|
}
|
|
perror(res0->ai_canonname);
|
|
goto bad;
|
|
}
|
|
if (fd2p == 0) {
|
|
(void) __write(s, "", 1);
|
|
port = 0;
|
|
} else {
|
|
char num[32];
|
|
int s2;
|
|
union
|
|
{
|
|
struct sockaddr_storage ss;
|
|
struct sockaddr sa;
|
|
} sa2;
|
|
socklen_t sa2len;
|
|
|
|
s2 = __socket(res0->ai_family, res0->ai_socktype, 0);
|
|
if (s2 < 0)
|
|
goto bad;
|
|
|
|
__listen(s2, 1);
|
|
sa2len = sizeof (sa2);
|
|
if (__getsockname(s2, &sa2.sa, &sa2len) < 0) {
|
|
perror("getsockname");
|
|
(void) __close(s2);
|
|
goto bad;
|
|
} else if (sa2len != SA_LEN(&sa2.sa)) {
|
|
__set_errno(EINVAL);
|
|
(void) __close(s2);
|
|
goto bad;
|
|
}
|
|
port = 0;
|
|
if (!getnameinfo(&sa2.sa, sa2len,
|
|
NULL, 0, servbuff, sizeof(servbuff),
|
|
NI_NUMERICSERV))
|
|
port = strtol(servbuff, NULL, 10);
|
|
(void) sprintf(num, "%u", port);
|
|
(void) __write(s, num, strlen(num)+1);
|
|
{ socklen_t len = sizeof (from);
|
|
s3 = TEMP_FAILURE_RETRY (accept(s2, (struct sockaddr *)&from,
|
|
&len));
|
|
__close(s2);
|
|
if (s3 < 0) {
|
|
perror("accept");
|
|
port = 0;
|
|
goto bad;
|
|
}
|
|
}
|
|
*fd2p = s3;
|
|
}
|
|
|
|
struct iovec iov[3] =
|
|
{
|
|
[0] = { .iov_base = (void *) name, .iov_len = strlen (name) + 1 },
|
|
/* should public key encypt the password here */
|
|
[1] = { .iov_base = (void *) pass, .iov_len = strlen (pass) + 1 },
|
|
[2] = { .iov_base = (void *) cmd, .iov_len = strlen (cmd) + 1 }
|
|
};
|
|
(void) TEMP_FAILURE_RETRY (__writev (s, iov, 3));
|
|
|
|
/* We don't need the memory allocated for the name and the password
|
|
in ruserpass anymore. */
|
|
if (name != orig_name)
|
|
free ((char *) name);
|
|
if (pass != orig_pass)
|
|
free ((char *) pass);
|
|
|
|
if (__read(s, &c, 1) != 1) {
|
|
perror(*ahost);
|
|
goto bad;
|
|
}
|
|
if (c != 0) {
|
|
while (__read(s, &c, 1) == 1) {
|
|
(void) __write(2, &c, 1);
|
|
if (c == '\n')
|
|
break;
|
|
}
|
|
goto bad;
|
|
}
|
|
freeaddrinfo(res0);
|
|
return (s);
|
|
bad:
|
|
if (port)
|
|
(void) __close(*fd2p);
|
|
(void) __close(s);
|
|
bad2:
|
|
freeaddrinfo(res0);
|
|
return (-1);
|
|
}
|
|
libc_hidden_def (rexec_af)
|
|
|
|
int
|
|
rexec (char **ahost, int rport, const char *name, const char *pass,
|
|
const char *cmd, int *fd2p)
|
|
{
|
|
return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
|
|
}
|