mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-02 22:54:52 +00:00
Fix the GCC build after _FORTIFY_SOURCE import
We haven't exposed gets(3) in a long time, rip out __gets_chk before it's too late and something builds a gets(3) user with it enabled.
This commit is contained in:
parent
b667c40f9f
commit
8b0682644e
|
@ -48,7 +48,6 @@ int __snprintf_chk(char *__restrict, size_t, int, size_t,
|
||||||
int __vsnprintf_chk(char *__restrict, size_t, int, size_t,
|
int __vsnprintf_chk(char *__restrict, size_t, int, size_t,
|
||||||
const char *__restrict, __va_list)
|
const char *__restrict, __va_list)
|
||||||
__printflike(5, 0);
|
__printflike(5, 0);
|
||||||
char *__gets_chk(char *, size_t);
|
|
||||||
char *__fgets_chk(char *, int, size_t, FILE *);
|
char *__fgets_chk(char *, int, size_t, FILE *);
|
||||||
__END_DECLS
|
__END_DECLS
|
||||||
|
|
||||||
|
@ -78,11 +77,6 @@ __END_DECLS
|
||||||
fmt, ap); \
|
fmt, ap); \
|
||||||
})
|
})
|
||||||
|
|
||||||
#define gets(str) ({ \
|
|
||||||
char *_ssp_str = (str); \
|
|
||||||
__gets_chk(_ssp_str, __ssp_bos(_ssp_str)); \
|
|
||||||
})
|
|
||||||
|
|
||||||
#define fgets(str, len, fp) ({ \
|
#define fgets(str, len, fp) ({ \
|
||||||
char *_ssp_str = (str); \
|
char *_ssp_str = (str); \
|
||||||
__fgets_chk(_ssp_str, len, __ssp_bos(_ssp_str), fp); \
|
__fgets_chk(_ssp_str, len, __ssp_bos(_ssp_str), fp); \
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
.PATH: ${LIBC_SRCTOP}/secure
|
.PATH: ${LIBC_SRCTOP}/secure
|
||||||
|
|
||||||
# _FORTIFY_SOURCE
|
# _FORTIFY_SOURCE
|
||||||
SRCS+= gets_chk.c fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
|
SRCS+= fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
|
||||||
snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
|
snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
|
||||||
strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
|
strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
|
||||||
vsnprintf_chk.c vsprintf_chk.c
|
vsnprintf_chk.c vsprintf_chk.c
|
||||||
|
|
|
@ -5,7 +5,6 @@ FBSD_1.0 {
|
||||||
};
|
};
|
||||||
|
|
||||||
FBSD_1.8 {
|
FBSD_1.8 {
|
||||||
__gets_chk;
|
|
||||||
__fgets_chk;
|
__fgets_chk;
|
||||||
__memcpy_chk;
|
__memcpy_chk;
|
||||||
__memmove_chk;
|
__memmove_chk;
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
/*-
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
*
|
|
||||||
* Copyright (c) 2006 The NetBSD Foundation, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This code is derived from software contributed to The NetBSD Foundation
|
|
||||||
* by Christos Zoulas.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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/cdefs.h>
|
|
||||||
__RCSID("$NetBSD: gets_chk.c,v 1.7 2013/10/04 20:49:16 christos Exp $");
|
|
||||||
|
|
||||||
#include <limits.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include <ssp/stdio.h>
|
|
||||||
#include <ssp/string.h>
|
|
||||||
|
|
||||||
char *__gets_unsafe(char *);
|
|
||||||
|
|
||||||
char *
|
|
||||||
__gets_chk(char * __restrict buf, size_t slen)
|
|
||||||
{
|
|
||||||
char *abuf;
|
|
||||||
size_t len;
|
|
||||||
|
|
||||||
if (slen >= (size_t)INT_MAX)
|
|
||||||
return (__gets_unsafe(buf));
|
|
||||||
|
|
||||||
if ((abuf = malloc(slen + 1)) == NULL)
|
|
||||||
return (__gets_unsafe(buf));
|
|
||||||
|
|
||||||
if (fgets(abuf, (int)(slen + 1), stdin) == NULL) {
|
|
||||||
free(abuf);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
len = strlen(abuf);
|
|
||||||
if (len > 0 && abuf[len - 1] == '\n')
|
|
||||||
--len;
|
|
||||||
|
|
||||||
if (len >= slen)
|
|
||||||
__chk_fail();
|
|
||||||
|
|
||||||
(void)memcpy(buf, abuf, len);
|
|
||||||
|
|
||||||
buf[len] = '\0';
|
|
||||||
free(abuf);
|
|
||||||
return (buf);
|
|
||||||
}
|
|
|
@ -4,7 +4,7 @@ SHLIBDIR?= /lib
|
||||||
SHLIB= ssp
|
SHLIB= ssp
|
||||||
SHLIB_MAJOR= 0
|
SHLIB_MAJOR= 0
|
||||||
|
|
||||||
SSP_SRCS= gets_chk.c fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
|
SSP_SRCS= fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
|
||||||
snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
|
snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
|
||||||
strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
|
strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
|
||||||
vsnprintf_chk.c vsprintf_chk.c
|
vsnprintf_chk.c vsprintf_chk.c
|
||||||
|
|
|
@ -20,7 +20,6 @@ LIBSSP_1.0 {
|
||||||
};
|
};
|
||||||
|
|
||||||
LIBSSP_1.1 {
|
LIBSSP_1.1 {
|
||||||
__gets_chk;
|
|
||||||
__fgets_chk;
|
__fgets_chk;
|
||||||
__memmove_chk;
|
__memmove_chk;
|
||||||
__stpncpy_chk;
|
__stpncpy_chk;
|
||||||
|
|
|
@ -49,8 +49,6 @@
|
||||||
.Ft int
|
.Ft int
|
||||||
.Fn vsnprintf "char *str" "size_t len" "const char *fmt" "va_list ap"
|
.Fn vsnprintf "char *str" "size_t len" "const char *fmt" "va_list ap"
|
||||||
.Ft char *
|
.Ft char *
|
||||||
.Fn gets "char *str"
|
|
||||||
.Ft char *
|
|
||||||
.Fn fgets "char *str" "int len" "FILE *fp"
|
.Fn fgets "char *str" "int len" "FILE *fp"
|
||||||
.In ssp/string.h
|
.In ssp/string.h
|
||||||
.Ft void *
|
.Ft void *
|
||||||
|
|
Loading…
Reference in a new issue