hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-22 03:04:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: move __ssp_overlap back out into <ssp/ssp.h>

Browse Source 
We'll be using it in some upcoming definitions in headers, so move it
back now but slap a warning on it.  Our upcoming uses will all be inside
of inline functions, so we're not overly concerned about double
evaluation immediately.

Reviewed by:	markj
Sponsored by:	Klara, Inc.
Sponsored by:	Stormshield
Differential Revision:	https://reviews.freebsd.org/D45677
This commit is contained in:
Kyle Evans 2024-07-13 00:16:09 -05:00
parent 41c233dec6
commit 4719366192
7 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/ssp/ssp.h
View File

@ -83,6 +83,13 @@ __ssp_inline rtype fun args { \
#define __ssp_redirect0(rtype, fun, args, call) \ #define __ssp_redirect0(rtype, fun, args, call) \
__ssp_redirect_raw(rtype, fun, fun, args, call, 1, __ssp_bos0) __ssp_redirect_raw(rtype, fun, fun, args, call, 1, __ssp_bos0)
/*
* Take caution when using __ssp_overlap! Don't use it in contexts where we
* can end up with double-evaluation of a statement with some side-effects.
*/
#define __ssp_overlap(a, b, l) \
(((a) <= (b) && (b) < (a) + (l)) || ((b) <= (a) && (a) < (b) + (l)))
__BEGIN_DECLS __BEGIN_DECLS
void __stack_chk_fail(void) __dead2; void __stack_chk_fail(void) __dead2;
void __chk_fail(void) __dead2; void __chk_fail(void) __dead2;

2
lib/libc/secure/memcpy_chk.c
View File

@ -37,8 +37,6 @@ __RCSID("$NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $");
#include <ssp/string.h> #include <ssp/string.h>
#undef memcpy #undef memcpy
#include "ssp_internal.h"
void * void *
__memcpy_chk(void * __restrict dst, const void * __restrict src, size_t len, __memcpy_chk(void * __restrict dst, const void * __restrict src, size_t len,
size_t slen) size_t slen)

37
lib/libc/secure/ssp_internal.h
View File

@ -1,37 +0,0 @@
/* $NetBSD: ssp.h,v 1.13 2015/09/03 20:43:47 plunky Exp $ */
/*-
* Copyright (c) 2006, 2011 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.
*/
#ifndef _SECURE_SSP_INTERNAL_H_
#define _SECURE_SSP_INTERNAL_H_
#define __ssp_overlap(a, b, l) \
(((a) <= (b) && (b) < (a) + (l)) || ((b) <= (a) && (a) < (b) + (l)))
#endif /* _SECURE_SSP_INTERNAL_H_ */

2
lib/libc/secure/stpcpy_chk.c
View File

@ -37,8 +37,6 @@ __RCSID("$NetBSD: stpcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $");
#include <ssp/string.h> #include <ssp/string.h>
#undef memcpy #undef memcpy
#include "ssp_internal.h"
char * char *
__stpcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen) __stpcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen)
{ {

2
lib/libc/secure/stpncpy_chk.c
View File

@ -37,8 +37,6 @@ __RCSID("$NetBSD: stpncpy_chk.c,v 1.3 2015/05/09 15:42:21 christos Exp $");
#include <ssp/string.h> #include <ssp/string.h>
#undef stpncpy #undef stpncpy
#include "ssp_internal.h"
char * char *
__stpncpy_chk(char * __restrict dst, const char * __restrict src, size_t len, __stpncpy_chk(char * __restrict dst, const char * __restrict src, size_t len,
size_t slen) size_t slen)

2
lib/libc/secure/strcpy_chk.c
View File

@ -37,8 +37,6 @@ __RCSID("$NetBSD: strcpy_chk.c,v 1.8 2015/05/09 15:42:21 christos Exp $");
#include <ssp/string.h> #include <ssp/string.h>
#undef memcpy #undef memcpy
#include "ssp_internal.h"
char * char *
__strcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen) __strcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen)
{ {

2
lib/libc/secure/strncpy_chk.c
View File

@ -37,8 +37,6 @@ __RCSID("$NetBSD: strncpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $");
#include <ssp/string.h> #include <ssp/string.h>
#undef strncpy #undef strncpy
#include "ssp_internal.h"
char * char *
__strncpy_chk(char * __restrict dst, const char * __restrict src, size_t len, __strncpy_chk(char * __restrict dst, const char * __restrict src, size_t len,
size_t slen) size_t slen)