From nobody Sat Jul 13 05:22:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WLcL962jsz5Pvj9; Sat, 13 Jul 2024 05:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLcL95CSgz4nrL; Sat, 13 Jul 2024 05:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720848177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qe9nJQRVKSHRxgpY/sx84VPZRm+QiVwxlvQ/hXioZ1k=; b=ELpkFyk+9RAtRjdUGLaGvS1b4MY3OSoMeOSWj2TkoPcEGBI2Gi/QPTzRK+Vyp2e9HSIbhp XR0pxKV7gELPLP1eEk4Mx+uxxE+OMpTEnI2iJ6hDSO9v+xtu1IzonAju6IaToWfFz65rX/ PuPVDJWIBmWiOA4jJW48lQXXzV/czjlBZUEPmcm/Egsx9GUw26D0+3Qe937dOIHsjGGGeP cPu+JuJgsGegRppN8pLpB+7HLuoxF5tMdKeIFtrokyggU057/5gmva9PixIEzlq1Ec8eCG Cedr3dW5FsqHRkDPyxF7J0SGeb+sqIlIjgASbdmLOaeJlR4lE0yMd/MjTENqiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720848177; a=rsa-sha256; cv=none; b=L/j2EGFWHiNSxjjFucyiRDU39DavugUpdjSQKB1KLh+3UsKXk0bJ+RZv6drCGDWDoAmC9m 8UkzpAlg8AuAtzNxac+6D1xXRf18bPRhEyUaRYJnOkrkw4s6d3B9q9H05AK5VEhGN5L/3G 5WThayUMvUOQzTpQvmoJ/4AVq/+YctGHyQUpDpmvdgGeF3sE8bCscXq/iWhX3Di/NW4aQT 7f/d/H+saFYpjLqDolzPj/xy+bEhYBk068OIciV1nuxJuD5BesjJEkelkr2whBiFpF6yrA 9EuECJ6x/FMprUIoJqGbaD/MntbyKmwkChiawIdvLfjSxbTxNWbslw+ailTSvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720848177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qe9nJQRVKSHRxgpY/sx84VPZRm+QiVwxlvQ/hXioZ1k=; b=KIxUyX+AIok//+ZzGNNOJl56FoViOiT3J+iZPnQFEj7R4/Grd+b8L3Q3YufxMj5r+AMlwK 6+zugRye/VJIy1s7VC+dWakHDnzys722278VD/m2GmGgsNWXT3LLLRRMPzRcxREs8Omopa kZ+m3unQbJerkVxv0Rma28rHJIaKoY6PyhxFe9J1lcYv72tDD7yzmhw63QrS/DLoKBj6Dg 1Cp86BroJvQF4YnhtQvocnsYXrzpaC68zjI5RZn83g48tMngFR6UA8roirb/GyOct4/Gwm +Xis32tZadFBv3d2XFmWMhyyn13flQaiCujDxEIPLAHvSKr1Qsd7e0v9FLnNXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WLcL94qpjzDqM; Sat, 13 Jul 2024 05:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46D5MvAt032363; Sat, 13 Jul 2024 05:22:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46D5Mvoa032360; Sat, 13 Jul 2024 05:22:57 GMT (envelope-from git) Date: Sat, 13 Jul 2024 05:22:57 GMT Message-Id: <202407130522.46D5Mvoa032360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 4719366192d3 - main - libc: move __ssp_overlap back out into List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4719366192d306a76e8e86bf926387f1c4122fd3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4719366192d306a76e8e86bf926387f1c4122fd3 commit 4719366192d306a76e8e86bf926387f1c4122fd3 Author: Kyle Evans AuthorDate: 2024-07-13 05:16:09 +0000 Commit: Kyle Evans CommitDate: 2024-07-13 05:16:23 +0000 libc: move __ssp_overlap back out into 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 --- include/ssp/ssp.h | 7 +++++++ lib/libc/secure/memcpy_chk.c | 2 -- lib/libc/secure/ssp_internal.h | 37 ------------------------------------- lib/libc/secure/stpcpy_chk.c | 2 -- lib/libc/secure/stpncpy_chk.c | 2 -- lib/libc/secure/strcpy_chk.c | 2 -- lib/libc/secure/strncpy_chk.c | 2 -- 7 files changed, 7 insertions(+), 47 deletions(-) diff --git a/include/ssp/ssp.h b/include/ssp/ssp.h index 35a9aeee02df..622e9e901ba6 100644 --- a/include/ssp/ssp.h +++ b/include/ssp/ssp.h @@ -83,6 +83,13 @@ __ssp_inline rtype fun args { \ #define __ssp_redirect0(rtype, fun, args, call) \ __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 void __stack_chk_fail(void) __dead2; void __chk_fail(void) __dead2; diff --git a/lib/libc/secure/memcpy_chk.c b/lib/libc/secure/memcpy_chk.c index 99cf2d5f13ff..2a269cb475ab 100644 --- a/lib/libc/secure/memcpy_chk.c +++ b/lib/libc/secure/memcpy_chk.c @@ -37,8 +37,6 @@ __RCSID("$NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $"); #include #undef memcpy -#include "ssp_internal.h" - void * __memcpy_chk(void * __restrict dst, const void * __restrict src, size_t len, size_t slen) diff --git a/lib/libc/secure/ssp_internal.h b/lib/libc/secure/ssp_internal.h deleted file mode 100644 index 34e5981ba0ca..000000000000 --- a/lib/libc/secure/ssp_internal.h +++ /dev/null @@ -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_ */ diff --git a/lib/libc/secure/stpcpy_chk.c b/lib/libc/secure/stpcpy_chk.c index 72a4bfb8017a..fd4849099675 100644 --- a/lib/libc/secure/stpcpy_chk.c +++ b/lib/libc/secure/stpcpy_chk.c @@ -37,8 +37,6 @@ __RCSID("$NetBSD: stpcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $"); #include #undef memcpy -#include "ssp_internal.h" - char * __stpcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen) { diff --git a/lib/libc/secure/stpncpy_chk.c b/lib/libc/secure/stpncpy_chk.c index dfd26133feed..d76f0eb62fcd 100644 --- a/lib/libc/secure/stpncpy_chk.c +++ b/lib/libc/secure/stpncpy_chk.c @@ -37,8 +37,6 @@ __RCSID("$NetBSD: stpncpy_chk.c,v 1.3 2015/05/09 15:42:21 christos Exp $"); #include #undef stpncpy -#include "ssp_internal.h" - char * __stpncpy_chk(char * __restrict dst, const char * __restrict src, size_t len, size_t slen) diff --git a/lib/libc/secure/strcpy_chk.c b/lib/libc/secure/strcpy_chk.c index b89be466240d..14403bd74469 100644 --- a/lib/libc/secure/strcpy_chk.c +++ b/lib/libc/secure/strcpy_chk.c @@ -37,8 +37,6 @@ __RCSID("$NetBSD: strcpy_chk.c,v 1.8 2015/05/09 15:42:21 christos Exp $"); #include #undef memcpy -#include "ssp_internal.h" - char * __strcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen) { diff --git a/lib/libc/secure/strncpy_chk.c b/lib/libc/secure/strncpy_chk.c index 3a2c19796a39..c8d411638862 100644 --- a/lib/libc/secure/strncpy_chk.c +++ b/lib/libc/secure/strncpy_chk.c @@ -37,8 +37,6 @@ __RCSID("$NetBSD: strncpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $"); #include #undef strncpy -#include "ssp_internal.h" - char * __strncpy_chk(char * __restrict dst, const char * __restrict src, size_t len, size_t slen)