From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by sourceware.org (Postfix) with ESMTPS id 18352385800A for ; Thu, 31 Dec 2020 10:48:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 18352385800A Received: by mail-qk1-x731.google.com with SMTP id w79so16056814qkb.5 for ; Thu, 31 Dec 2020 02:48:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=sztYMUGL5Usl+/O7z2apAijNveRRoug7sGHgHaeZEB0=; b=ltzpI2oz6zoJT0/ivYAz7Q/eV/WC52IwTuwFBEPK0OX6ZdY0SP5DNMqGg+3UdunTTu hO3OoGYUCKmOUMr54bKYKaaRCt85jP0pqmZPqc5CMzCRILiPZNx3QzA75zb+BR6+Fesw bR8JOOvdddkNxjSlCIi0CpAUvHcDTjYCSFMTfGtmrQrEqBsdeWCnnFRt02b/uw4sopGa KzAKZmsulZ2K2/htjxSU/vMVsW909cTa9LCTXgQ7Z6zijL/nPwlHXAP1xZ30Ainayh4v u1qq1K7DGxqqN4gZQSmBGNVhS8Ndu3pXDPg1hbwGxy7pE0Pj6/G9HhAa4BAFAwUt1CMp TarA== X-Gm-Message-State: AOAM53196mgS6ZzOUotaGJnR1gcb2jmCJUIEmOdZmtGnEzjBmJbcuvgb k0TaFs/GYwUp+/BPAl4G2L3l1/3M45Zvzg== X-Google-Smtp-Source: ABdhPJz4l3HeWVamB0HHQ7j7dv7dgoxIhO7o1aEjMZXyPzXsrPVQQ3mRP5FG0j1jdedqqyHoaqZZdg== X-Received: by 2002:a37:6845:: with SMTP id d66mr55089825qkc.463.1609411696687; Thu, 31 Dec 2020 02:48:16 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id f24sm29501644qkk.89.2020.12.31.02.48.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 31 Dec 2020 02:48:16 -0800 (PST) Subject: Re: [PATCH v7 3/4] string: Enable __FORTIFY_LEVEL=3 To: Siddhesh Poyarekar , libc-alpha@sourceware.org Cc: fweimer@redhat.com, jakub@redhat.com References: <20201230064348.376092-1-siddhesh@sourceware.org> <20201230064348.376092-4-siddhesh@sourceware.org> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <96a468d2-2953-5a3d-cd98-1a3745f6651d@linaro.org> Date: Thu, 31 Dec 2020 07:48:14 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201230064348.376092-4-siddhesh@sourceware.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-16.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2020 10:48:18 -0000 On 30/12/2020 03:43, Siddhesh Poyarekar wrote: > This change enhances fortified string functions to use > __builtin_dynamic_object_size under _FORTIFY_SOURCE=3 whenever the > compiler supports it. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > include/string.h | 5 +++-- > string/bits/string_fortified.h | 29 ++++++++++++++++++----------- > string/bits/strings_fortified.h | 6 ++++-- > 3 files changed, 25 insertions(+), 15 deletions(-) > > diff --git a/include/string.h b/include/string.h > index 7d344d77d4..81dab39891 100644 > --- a/include/string.h > +++ b/include/string.h > @@ -123,10 +123,11 @@ libc_hidden_proto (__strerror_l) > void __explicit_bzero_chk_internal (void *, size_t, size_t) > __THROW __nonnull ((1)) attribute_hidden; > # define explicit_bzero(buf, len) \ > - __explicit_bzero_chk_internal (buf, len, __bos0 (buf)) > + __explicit_bzero_chk_internal (buf, len, __glibc_objsize0 (buf)) > #elif !IS_IN (nonlib) > void __explicit_bzero_chk (void *, size_t, size_t) __THROW __nonnull ((1)); > -# define explicit_bzero(buf, len) __explicit_bzero_chk (buf, len, __bos0 (buf)) > +# define explicit_bzero(buf, len) __explicit_bzero_chk (buf, len, \ > + __glibc_objsize0 (buf)) > #endif > > libc_hidden_builtin_proto (memchr) > diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h > index 4c1aeb45f1..92d75f10fa 100644 > --- a/string/bits/string_fortified.h > +++ b/string/bits/string_fortified.h > @@ -26,13 +26,15 @@ __fortify_function void * > __NTH (memcpy (void *__restrict __dest, const void *__restrict __src, > size_t __len)) > { > - return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); > + return __builtin___memcpy_chk (__dest, __src, __len, > + __glibc_objsize0 (__dest)); > } > > __fortify_function void * > __NTH (memmove (void *__dest, const void *__src, size_t __len)) > { > - return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest)); > + return __builtin___memmove_chk (__dest, __src, __len, > + __glibc_objsize0 (__dest)); > } > > #ifdef __USE_GNU > @@ -40,7 +42,8 @@ __fortify_function void * > __NTH (mempcpy (void *__restrict __dest, const void *__restrict __src, > size_t __len)) > { > - return __builtin___mempcpy_chk (__dest, __src, __len, __bos0 (__dest)); > + return __builtin___mempcpy_chk (__dest, __src, __len, > + __glibc_objsize0 (__dest)); > } > #endif > > @@ -53,7 +56,8 @@ __NTH (mempcpy (void *__restrict __dest, const void *__restrict __src, > __fortify_function void * > __NTH (memset (void *__dest, int __ch, size_t __len)) > { > - return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest)); > + return __builtin___memset_chk (__dest, __ch, __len, > + __glibc_objsize0 (__dest)); > } > > #ifdef __USE_MISC > @@ -65,21 +69,21 @@ void __explicit_bzero_chk (void *__dest, size_t __len, size_t __destlen) > __fortify_function void > __NTH (explicit_bzero (void *__dest, size_t __len)) > { > - __explicit_bzero_chk (__dest, __len, __bos0 (__dest)); > + __explicit_bzero_chk (__dest, __len, __glibc_objsize0 (__dest)); > } > #endif > > __fortify_function char * > __NTH (strcpy (char *__restrict __dest, const char *__restrict __src)) > { > - return __builtin___strcpy_chk (__dest, __src, __bos (__dest)); > + return __builtin___strcpy_chk (__dest, __src, __glibc_objsize (__dest)); > } > > #ifdef __USE_GNU > __fortify_function char * > __NTH (stpcpy (char *__restrict __dest, const char *__restrict __src)) > { > - return __builtin___stpcpy_chk (__dest, __src, __bos (__dest)); > + return __builtin___stpcpy_chk (__dest, __src, __glibc_objsize (__dest)); > } > #endif > > @@ -88,14 +92,16 @@ __fortify_function char * > __NTH (strncpy (char *__restrict __dest, const char *__restrict __src, > size_t __len)) > { > - return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); > + return __builtin___strncpy_chk (__dest, __src, __len, > + __glibc_objsize (__dest)); > } > > #if __GNUC_PREREQ (4, 7) || __glibc_clang_prereq (2, 6) > __fortify_function char * > __NTH (stpncpy (char *__dest, const char *__src, size_t __n)) > { > - return __builtin___stpncpy_chk (__dest, __src, __n, __bos (__dest)); > + return __builtin___stpncpy_chk (__dest, __src, __n, > + __glibc_objsize (__dest)); > } > #else > extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n, > @@ -118,7 +124,7 @@ __NTH (stpncpy (char *__dest, const char *__src, size_t __n)) > __fortify_function char * > __NTH (strcat (char *__restrict __dest, const char *__restrict __src)) > { > - return __builtin___strcat_chk (__dest, __src, __bos (__dest)); > + return __builtin___strcat_chk (__dest, __src, __glibc_objsize (__dest)); > } > > > @@ -126,7 +132,8 @@ __fortify_function char * > __NTH (strncat (char *__restrict __dest, const char *__restrict __src, > size_t __len)) > { > - return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest)); > + return __builtin___strncat_chk (__dest, __src, __len, > + __glibc_objsize (__dest)); > } > > #endif /* bits/string_fortified.h */ > diff --git a/string/bits/strings_fortified.h b/string/bits/strings_fortified.h > index d4091f4f69..7752faf4e3 100644 > --- a/string/bits/strings_fortified.h > +++ b/string/bits/strings_fortified.h > @@ -22,13 +22,15 @@ > __fortify_function void > __NTH (bcopy (const void *__src, void *__dest, size_t __len)) > { > - (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest)); > + (void) __builtin___memmove_chk (__dest, __src, __len, > + __glibc_objsize0 (__dest)); > } > > __fortify_function void > __NTH (bzero (void *__dest, size_t __len)) > { > - (void) __builtin___memset_chk (__dest, '\0', __len, __bos0 (__dest)); > + (void) __builtin___memset_chk (__dest, '\0', __len, > + __glibc_objsize0 (__dest)); > } > > #endif >