From patchwork Wed Nov 29 09:42:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yaakov Selkowitz X-Patchwork-Id: 119944 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2837987qgn; Wed, 29 Nov 2017 01:51:45 -0800 (PST) X-Google-Smtp-Source: AGs4zMZp8EX0b5QN8oXvw+vRhSXDl4PalyWVIlLDhWZhc9kgfuj1j3XjG8lKhk0tcxlsMC+9v2ly X-Received: by 10.101.87.139 with SMTP id b11mr2278113pgr.314.1511949105911; Wed, 29 Nov 2017 01:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511949105; cv=none; d=google.com; s=arc-20160816; b=lXb7Fe37yvFeukIFJxvaTJBoHi7r0+GJegY+x4pziXQISukjNg2DvECMwIzGfV36CR I9vv2hSD+M2eQivOYmqQfQMCRN1tb5DcA8sBI0EZra0t1JsC4BzzJfIN9bUpue5K37O9 ad42DOo5uWTNgHGXhBDFAlrkiKyPDiTDk5y+Y7nXhLKEw8fWXWpvErsZkU8pHXVR6exu CIQsEB4JQLCKw2AWw3ulOq7KraxNcBK5ecH9XmzAJ7pxkFAVuRueh0IA8Bxy/HqWS/+x ShgOj41FolHkB8yyLN/n8SvMw8Iu6H+ZuxwO4XxDtQnBqzFl8Z0hj/46m8Fo6ksfU7Ps /RkQ== 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=fS8Lx/xEDlR/+LavzbC/5w35EqGQBX01dgOSbWlllNk=; b=LWNYpXG0jiTEVB9UfwCj+tT4QyF2cni/twkJZ6v8M+fxuVRsHB3r9aKUB84MtOpAJV g+6JknY3Z+TU9uZ65N6a+Oy2Bn+U9wh5+lScIHsTIJmoCGRBPaao5m9F1FgZ7QPz2H4x KKgt4mNzkoUy69IjjzYyTRwEk7V8IK3cxJ8mO0T3Knn/tdQDE/mvdjLr9UcVncvvQ6F+ IEKh13o7fGJ+esjT7g3Tp6VPeOE8lthVsCi6wxoIkUIy2THCQD/PV5ErgS9uUIBV2S0G T5xQlX2+92Swe766uIsEIQa4a7xw0sSxYmhbDghM4aLPHeGVONQJb5UeBPi57wC/9OV5 tcGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=BwunmJit; spf=pass (google.com: domain of newlib-return-15405-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-15405-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 v29si1074431pfl.292.2017.11.29.01.51.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 01:51:45 -0800 (PST) Received-SPF: pass (google.com: domain of newlib-return-15405-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=BwunmJit; spf=pass (google.com: domain of newlib-return-15405-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-15405-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=OIUa/m7mtnh5XokYwr50xmp7oRvuj9q YVNWpIhOWjb6abnIWPigb/SCWdo2dIUXz2WrupWfceyiEIIqt96DwH8tu5DZtDy1 hLiQxHOwmyItqBIP5vp6B7NzdMsXGDtf5+fbVfjwBSpizfxyTWfRW8BHZZyCpvYj RqStAe/CZkDo= 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=JN6vFhqf9RCsRsbt7RgC5GBPFLU=; b=Bwunm JitLEYNt2buBbAFD0I7bodQONR9I+szQ7lWy/efgsUwSyGWssCe7X0vQE4OtwoUl VUqm5Y4TqMFjy0QsYWxu4qKgBa35tHcQ30h6sRvm7gq+06dmfU7hvPHNpcRH1IuF dFKJzWja4J1n0u20CdgFmdhCN8zRiCA/7fsRTs= Received: (qmail 106643 invoked by alias); 29 Nov 2017 09:51:36 -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 106632 invoked by uid 89); 29 Nov 2017 09:51:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= 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 09:51:34 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A59DA4E33B for ; Wed, 29 Nov 2017 09:43:16 +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 37ACF60BE5 for ; Wed, 29 Nov 2017 09:43:16 +0000 (UTC) From: Yaakov Selkowitz To: newlib@sourceware.org Subject: [PATCH v5 06/10] ssp: add Object Size Checking for unistd.h, part 1 Date: Wed, 29 Nov 2017 03:42:56 -0600 Message-Id: <20171129094300.20296-7-yselkowi@redhat.com> In-Reply-To: <20171129094300.20296-1-yselkowi@redhat.com> References: <20171129094300.20296-1-yselkowi@redhat.com> The implementation is from NetBSD, with the addition of feature test macros for readlink. glibc also wraps the following functions: confstr, getdomainname, getgroups, gethostname, getlogin_r, getwd, pread, readlinkat, ttyname_r. Signed-off-by: Yaakov Selkowitz --- newlib/libc/include/ssp/unistd.h | 53 ++++++++++++++++++++++++++++++++++++++++ newlib/libc/include/sys/unistd.h | 5 ++++ 2 files changed, 58 insertions(+) create mode 100644 newlib/libc/include/ssp/unistd.h -- 2.15.0 diff --git a/newlib/libc/include/ssp/unistd.h b/newlib/libc/include/ssp/unistd.h new file mode 100644 index 000000000..861edd30b --- /dev/null +++ b/newlib/libc/include/ssp/unistd.h @@ -0,0 +1,53 @@ +/* $NetBSD: unistd.h,v 1.7 2015/06/25 18:41:03 joerg Exp $ */ + +/*- + * 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. + */ +#ifndef _SSP_UNISTD_H_ +#define _SSP_UNISTD_H_ + +#include + +#if __SSP_FORTIFY_LEVEL > 0 +__BEGIN_DECLS + +__ssp_redirect0(_READ_WRITE_RETURN_TYPE, read, \ + (int __fd, void *__buf, size_t __len), (__fd, __buf, __len)); + +#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4 +__ssp_redirect(ssize_t, readlink, (const char *__restrict __path, \ + char *__restrict __buf, size_t __len), (__path, __buf, __len)); +#endif + +__ssp_redirect_raw(char *, getcwd, (char *__buf, size_t __len), + (__buf, __len), __buf != 0, __ssp_bos); + +__END_DECLS + +#endif /* __SSP_FORTIFY_LEVEL > 0 */ +#endif /* _SSP_UNISTD_H_ */ diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h index 75f8a51df..0df4dc374 100644 --- a/newlib/libc/include/sys/unistd.h +++ b/newlib/libc/include/sys/unistd.h @@ -567,4 +567,9 @@ int _EXFUN(unlinkat, (int, const char *, int)); #ifdef __cplusplus } #endif + +#if __SSP_FORTIFY_LEVEL > 0 +#include +#endif + #endif /* _SYS_UNISTD_H */