From patchwork Wed Nov 29 00:21:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yaakov Selkowitz X-Patchwork-Id: 119918 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2404265qgn; Tue, 28 Nov 2017 16:31:55 -0800 (PST) X-Google-Smtp-Source: AGs4zMYjKbblYLesnMddV1tJMWjYSEjFGpncJw1hc5lfc8ZMn/sa4Opv8gkfTTOfY0x5it6vE+8n X-Received: by 10.159.240.138 with SMTP id p10mr1009473plr.360.1511915515307; Tue, 28 Nov 2017 16:31:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511915515; cv=none; d=google.com; s=arc-20160816; b=IrlpNqFj9Z/qDRT/S/2SFBAkJIMpVHP89UIKMp4b8ZAtuXONnJq2cXm+QwAKqph1XG 9O0KAAlO0WdGwGQJ/VdBXzIxel7UySpRnw+y0iAgxwaWfusSQXO7XJR5ZRxzXCzQ5YrV gjfu9BK7JHNFbzT86A7NPSJTs6eUDL0vpdtjE7sMCG5z+my2TMVqwMGsVAxb152ynoLY UWpX29E3tJQCdBrj2klTVt4wnkM1kM/4c7AmIBj8Wf9RPEYRtLh1TLg3fl4WoeM85m4e bydCqcLSd42uT/Fv4tqK4SQiHogX0mSem+537h3Tcur2N2+KhAs4UyuX6tjHJrlOYoUx hhMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=AXfYNCaHkrx3RcBZbrOJjfSPzkllnVBDQUjRiVEL0ts=; b=N6CBaEFQ89ThZpD8+qok4Ct2xhdFmgh65xrChdDfXrdnEUOwXXCv5Dzz7Le56TVz+V iZ0SMqvjSlVTs7ZahVpkQTadhXuLunSDix+x0OCEBlD2BZ9RiTCn/daSZ0wuWNqKqvLQ i9263nAQGINwvLWp0HIydvemyIOEHvMkYl2ZF3qPtTt/TlS/BZAdC32F+7qyXkSy+YNx hVFCpx8sbatNbN0HLf15JXdREGDvCkUoMj5Fk1rvNqUcLL6e4ZvlaIRygoiZJ9NVP1DJ 061S0iEO8uHRbCg9/sqvPEkg9PYoTBdKKYRY/j3SahwsFlV2lIwrZLu8IlPhvN6gUYcc BE1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=JE0zMHjd; spf=pass (google.com: domain of newlib-return-15396-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-15396-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id q29si298444pgc.765.2017.11.28.16.31.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Nov 2017 16:31:55 -0800 (PST) Received-SPF: pass (google.com: domain of newlib-return-15396-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=JE0zMHjd; spf=pass (google.com: domain of newlib-return-15396-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-15396-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=s06u9OozOEbIojzQiTMgMQEOuxYZau4 Rl4ywxQ+GPNoIqSKGH7YCq8Ktels569+Iu6FwseIZDIvByXl3pwj6HQrPZl7ytHk ItNo2W9l1Eu/srlXnfcx9UR+cO2sgdewhA68NQe/1IryZ9BZicCapISYyZJt73FO cZNT4b0pdQcc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=l2FfgCiS8bmvo4ONMR1UG5Z54sE=; b=JE0zM HjdivuBzsJrhGJhX2zvMtOy6NEbi/vmFyaZQywrCvdsjWhM3HYMNh07oslNjOiwI SQjVlQZ7xDvf7MBJMtJVuCk5sk0geZF5C2SSZyTcngHsdtyn9i3sNmXuBKc+DcSb XBnhD7Hw06c57ggYc8z5P3uoIzRCQEyy/F0V/w= Received: (qmail 13816 invoked by alias); 29 Nov 2017 00:31:39 -0000 Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-owner@sourceware.org Delivered-To: mailing list newlib@sourceware.org Received: (qmail 13760 invoked by uid 89); 29 Nov 2017 00:31:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KB_WAM_FROM_NAME_SINGLEWORD, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:3647 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 29 Nov 2017 00:31:37 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC2E281DED for ; Wed, 29 Nov 2017 00:21:54 +0000 (UTC) Received: from localhost.localdomain (ovpn-120-11.rdu2.redhat.com [10.10.120.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6179B600D1 for ; Wed, 29 Nov 2017 00:21:54 +0000 (UTC) From: Yaakov Selkowitz To: newlib@sourceware.org Subject: [PATCH v4 04/10] ssp: add Object Size Checking for strings.h functions Date: Tue, 28 Nov 2017 18:21:37 -0600 Message-Id: <20171129002143.12500-5-yselkowi@redhat.com> In-Reply-To: <20171129002143.12500-1-yselkowi@redhat.com> References: <20171129002143.12500-1-yselkowi@redhat.com> The implementation is from NetBSD, with the addition of explicit_bzero for parity with glibc. Signed-off-by: Yaakov Selkowitz --- newlib/libc/include/ssp/strings.h | 55 +++++++++++++++++++++++++++++++++++++++ newlib/libc/include/strings.h | 6 ++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 newlib/libc/include/ssp/strings.h -- 2.15.0 diff --git a/newlib/libc/include/ssp/strings.h b/newlib/libc/include/ssp/strings.h new file mode 100644 index 000000000..13adba175 --- /dev/null +++ b/newlib/libc/include/ssp/strings.h @@ -0,0 +1,55 @@ +/* $NetBSD: strings.h,v 1.3 2008/04/28 20:22:54 martin Exp $ */ + +/*- + * Copyright (c) 2007 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 _SSP_STRINGS_H_ +#define _SSP_STRINGS_H_ + +#include + +#if __SSP_FORTIFY_LEVEL > 0 + +#if __BSD_VISIBLE || __POSIX_VISIBLE <= 200112 +#define bcopy(src, dst, len) \ + ((__ssp_bos0(dst) != (size_t)-1) ? \ + __builtin___memmove_chk(dst, src, len, __ssp_bos0(dst)) : \ + __memmove_ichk(dst, src, len)) +#define bzero(dst, len) \ + ((__ssp_bos0(dst) != (size_t)-1) ? \ + __builtin___memset_chk(dst, 0, len, __ssp_bos0(dst)) : \ + __memset_ichk(dst, 0, len)) +#endif + +#if __BSD_VISIBLE +__ssp_redirect0(void, explicit_bzero, (void *__buf, size_t __len), \ + (__buf, __len)); +#endif + +#endif /* __SSP_FORTIFY_LEVEL > 0 */ +#endif /* _SSP_STRINGS_H_ */ diff --git a/newlib/libc/include/strings.h b/newlib/libc/include/strings.h index 50a304215..38a84a220 100644 --- a/newlib/libc/include/strings.h +++ b/newlib/libc/include/strings.h @@ -47,7 +47,7 @@ int bcmp(const void *, const void *, size_t) __pure; /* LEGACY */ void bcopy(const void *, void *, size_t); /* LEGACY */ void bzero(void *, size_t); /* LEGACY */ #endif -#if __BSD_VISIBLE +#if __BSD_VISIBLE && !__SSP_FORTIFY_LEVEL void explicit_bzero(void *, size_t); #endif #if __MISC_VISIBLE || __POSIX_VISIBLE < 200809 || __XSI_VISIBLE >= 700 @@ -73,4 +73,8 @@ int strncasecmp_l (const char *, const char *, size_t, locale_t); #endif __END_DECLS +#if __SSP_FORTIFY_LEVEL > 0 +#include +#endif + #endif /* _STRINGS_H_ */