From patchwork Wed Nov 29 00:21:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yaakov Selkowitz X-Patchwork-Id: 119910 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2395756qgn; Tue, 28 Nov 2017 16:22:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMa+9DsY3Ulyhm53sA4s403pwXkzIWKYU91ZAUzU5KpweiA62+ONDJykGDPi5blqsXMXGNkj X-Received: by 10.101.96.74 with SMTP id b10mr916319pgv.155.1511914940279; Tue, 28 Nov 2017 16:22:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511914940; cv=none; d=google.com; s=arc-20160816; b=w54OUcpTyNtAO3Smo1EqpAzTXpjKE51IrPfPVKk7yPqZPF/0miCY/N3eNTS0Jkwpip Dtzn5VcpHsyqdO4OseTXm0vxXbuYVo1xJLM8VGss6bbvI2UcwZCPzJny7P54zU/jNO+v y0TvLZlrIpPG3APq+KsgxRa3SKitobKnH9gkUjHUwQYjDj1j9NYEwBKXyFcPlNFSKwH/ QICG17P47gqk4eNotbhgZ0nX2io0FOBAGSKUY1ipLq+SoAUAEWCjmpAlPjCWmK6p4kGc +a4l088MnZIUvm/WInZ/j+SYVm5QFNhJpeaVA0vlvMIqAwjqNvI+VsH0UlvyhoK+yAt6 h4mw== 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=58lQyXAfk2/jWmd2EWhDNF9Z3uNkvXlfL4CgygxY0OI=; b=ZP4E9rg9xnMb4oWuU1AGdy7rsLfQqFiw7NpFRrXwMxpxOeOA1wo8Q/yKPUgp9ehATt JEa76vJO4TZWWXp96lwaHyY6DWODcIyPq4JqkMXMYX4nwtj7PMbTC7TpIH5mEhRqkGH0 0A8QP3/YXr3R1LMW29XPSdZQk8+c3A6rqCpaUS3QxMmDgoswm6Lt5BNvxJABHA/05l+L H6uTMKqRw2Vy2vzg1vBDVNhuqvw89fFDhclooPlQlCeZG9MLgua9MDDpsSb0EIurPsDE SnVG8uUnMHV628cVwfLNhETPiaMGar2OmchTxgFbgZ4+y8tDaGl2x3W/9gFSyc44DRjN 61yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tIbuX1BX; spf=pass (google.com: domain of newlib-return-15388-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-15388-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 a3si309780pgc.64.2017.11.28.16.22.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Nov 2017 16:22:20 -0800 (PST) Received-SPF: pass (google.com: domain of newlib-return-15388-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=tIbuX1BX; spf=pass (google.com: domain of newlib-return-15388-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-15388-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=oz1lrUgwaBB0Viow+hHzWtxM1ibVg0O 3wbOCxyNmpXZg5y2tUyf9XTcznmNE1ElZyvqj/xrXBF6iyndGQA0zkxT67XLP/TQ LJlyCq85hyfjMm3v8dbOPGoa9xwLNia3mvcGswenV6A06dV1Cw7Z7FhnmXBuZn0L npOnx0kBa9L0= 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=qJibNWF6GIGkr3ZD5zJN8zqRl/M=; b=tIbuX 1BXqhEHlFeBLXxfdAhfXE4hYw3D6JePneO7ME4e2SrugMJp/Tqgn0Fnpi/NCodAm BqD2iY8Vxq6fdIMquEjIlhAv1bga5+MMeEL9Ih92Z+JT2M88sznFe4b2KYeHGS3h EawET0i0RJv7btfgsgAwte7QGz/YrEkLCNOgpE= Received: (qmail 65885 invoked by alias); 29 Nov 2017 00:21:59 -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 65712 invoked by uid 89); 29 Nov 2017 00:21:59 -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 00:21:57 +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 4D0DF7F3ED for ; Wed, 29 Nov 2017 00:21:56 +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 DA53A600D1 for ; Wed, 29 Nov 2017 00:21:55 +0000 (UTC) From: Yaakov Selkowitz To: newlib@sourceware.org Subject: [PATCH v4 06/10] ssp: add Object Size Checking for unistd.h functions, part 1 Date: Tue, 28 Nov 2017 18:21:39 -0600 Message-Id: <20171129002143.12500-7-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 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 | 11 +++++++++ 2 files changed, 64 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..8430db644 --- /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(ssize_t, 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, 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..bfd3b3811 100644 --- a/newlib/libc/include/sys/unistd.h +++ b/newlib/libc/include/sys/unistd.h @@ -93,7 +93,9 @@ int _EXFUN(fdatasync, (int __fd)); #if __GNU_VISIBLE char * _EXFUN(get_current_dir_name, (void)); #endif +#if !__SSP_FORTIFY_LEVEL char * _EXFUN(getcwd, (char *__buf, size_t __size )); +#endif #if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500) int _EXFUN(getdomainname ,(char *__name, size_t __len)); #endif @@ -170,7 +172,9 @@ int _EXFUN(pipe2, (int __fildes[2], int flags)); #endif ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset)); ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset)); +#if !__SSP_FORTIFY_LEVEL _READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte )); +#endif #if __BSD_VISIBLE int _EXFUN(rresvport, (int *__alport)); int _EXFUN(revoke, (char *__path)); @@ -290,8 +294,10 @@ void _EXFUN(sync, (void)); #endif #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4 +#if !__SSP_FORTIFY_LEVEL ssize_t _EXFUN(readlink, (const char *__restrict __path, char *__restrict __buf, size_t __buflen)); +#endif int _EXFUN(symlink, (const char *__name1, const char *__name2)); #endif #if __ATFILE_VISIBLE @@ -567,4 +573,9 @@ int _EXFUN(unlinkat, (int, const char *, int)); #ifdef __cplusplus } #endif + +#if __SSP_FORTIFY_LEVEL > 0 +#include +#endif + #endif /* _SYS_UNISTD_H */