From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF5BAC433DF for ; Sat, 15 Aug 2020 21:33:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2B3C23133 for ; Sat, 15 Aug 2020 21:33:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726652AbgHOVdX (ORCPT ); Sat, 15 Aug 2020 17:33:23 -0400 Received: from smtprelay0071.hostedemail.com ([216.40.44.71]:33962 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726641AbgHOVdX (ORCPT ); Sat, 15 Aug 2020 17:33:23 -0400 Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave05.hostedemail.com (Postfix) with ESMTP id 342A318017514; Sat, 15 Aug 2020 21:24:03 +0000 (UTC) Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay06.hostedemail.com (Postfix) with ESMTP id BFB961800F594; Sat, 15 Aug 2020 21:24:02 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: wish32_1e17df327008 X-Filterd-Recvd-Size: 5107 Received: from XPS-9350.home (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf16.hostedemail.com (Postfix) with ESMTPA; Sat, 15 Aug 2020 21:23:59 +0000 (UTC) Message-ID: <457a91183581509abfa00575d0392be543acbe07.camel@perches.com> Subject: Re: [PATCH v2] lib/string.c: implement stpcpy From: Joe Perches To: Nick Desaulniers , Kees Cook Cc: Andrew Morton , =?ISO-8859-1?Q?D=E1vid_Bolvansk=FD?= , Eli Friedman , "# 3.4.x" , Arvind Sankar , Sami Tolvanen , Vishal Verma , Dan Williams , Andy Shevchenko , "Joel Fernandes (Google)" , Daniel Axtens , Ingo Molnar , Yury Norov , Alexandru Ardelean , LKML , clang-built-linux , Rasmus Villemoes Date: Sat, 15 Aug 2020 14:23:58 -0700 In-Reply-To: References: <20200815014006.GB99152@rani.riverdale.lan> <20200815020946.1538085-1-ndesaulniers@google.com> <202008150921.B70721A359@keescook> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.36.4-0ubuntu1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Sat, 2020-08-15 at 13:47 -0700, Nick Desaulniers wrote: > On Sat, Aug 15, 2020 at 9:34 AM Kees Cook wrote: > > On Fri, Aug 14, 2020 at 07:09:44PM -0700, Nick Desaulniers wrote: > > > LLVM implemented a recent "libcall optimization" that lowers calls to > > > `sprintf(dest, "%s", str)` where the return value is used to > > > `stpcpy(dest, str) - dest`. This generally avoids the machinery involved > > > in parsing format strings. Calling `sprintf` with overlapping arguments > > > was clarified in ISO C99 and POSIX.1-2001 to be undefined behavior. > > > > > > `stpcpy` is just like `strcpy` except it returns the pointer to the new > > > tail of `dest`. This allows you to chain multiple calls to `stpcpy` in > > > one statement. > > > > O_O What? > > > > No; this is a _terrible_ API: there is no bounds checking, there are no > > buffer sizes. Anything using the example sprintf() pattern is _already_ > > wrong and must be removed from the kernel. (Yes, I realize that the > > kernel is *filled* with this bad assumption that "I'll never write more > > than PAGE_SIZE bytes to this buffer", but that's both theoretically > > wrong ("640k is enough for anybody") and has been known to be wrong in > > practice too (e.g. when suddenly your writing routine is reachable by > > splice(2) and you may not have a PAGE_SIZE buffer). > > > > But we cannot _add_ another dangerous string API. We're already in a > > terrible mess trying to remove strcpy[1], strlcpy[2], and strncpy[3]. This > > needs to be addressed up by removing the unbounded sprintf() uses. (And > > to do so without introducing bugs related to using snprintf() when > > scnprintf() is expected[4].) > > Well, everything (-next, mainline, stable) is broken right now (with > ToT Clang) without providing this symbol. I'm not going to go clean > the entire kernel's use of sprintf to get our CI back to being green. Maybe this should get place in compiler-clang.h so it isn't generic and public. Something like: --- include/linux/compiler-clang.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index cee0c728d39a..6279f1904e39 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -61,3 +61,30 @@ #if __has_feature(shadow_call_stack) # define __noscs __attribute__((__no_sanitize__("shadow-call-stack"))) #endif + +#ifndef __HAVE_ARCH_STPCPY +/** + * stpcpy - copy a string from src to dest returning a pointer to the new end + * of dest, including src's NULL terminator. May overrun dest. + * @dest: pointer to buffer being copied into. + * Must be large enough to receive copy. + * @src: pointer to the beginning of string being copied from. + * Must not overlap dest. + * + * This function exists _only_ to support clang's possible conversion of + * sprintf calls to stpcpy. + * + * stpcpy differs from strcpy in two key ways: + * 1. inputs must not overlap. + * 2. return value is dest's NUL termination character after copy. + * (for strcpy, the return value is a pointer to src) + */ + +static inline char *stpcpy(char __restrict *dest, const char __restrict *src) +{ + while ((*dest++ = *src++) != '\0') { + ; /* nothing */ + } + return --dest; +} +#endif