From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb30.google.com (mail-yb1-xb30.google.com [IPv6:2607:f8b0:4864:20::b30]) by sourceware.org (Postfix) with ESMTPS id 8B87C3858D32; Sun, 12 Feb 2023 01:00:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B87C3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-yb1-xb30.google.com with SMTP id q9so10614571ybk.2; Sat, 11 Feb 2023 17:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6jksXo0Re+4tzObI/5OPvi9gTAGdM1ZQ96gRpOkE7aE=; b=cxaqluz0tg7hrWGI+p1v7EajoWxuT63wJUxSch7Jl20A+6xnGfEa5IkkHrtw/xDUpe YAJU4S70GVpich9qH8VXNV4sXwQLXr3A6eC2ZGYrtwMzetaF9ycIqogzFJt4tvn5Y1+i Zeje2F+RM76oQdLlKUW9qsuF8IGUHieZMQCwPrGl8Qq5ARNkcNhXy7tEozwbBGFOt9tu oLjEiIv/b3ssDikG+lMCTwXAvWcCldZCuWW5lzn/HwRsVqm/ZasUBpx0zlw2mUkW0Lmd 2QGC6VQCMl62KOtcaYiyL2BP4vvs4hDpJm9jcmQqKM2JrmipOT94k+DyMXxufcCh79R4 IDYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6jksXo0Re+4tzObI/5OPvi9gTAGdM1ZQ96gRpOkE7aE=; b=519YIUOjW5BoF9f8msjDelV+yuROjPG3v+M4idKrv3jlPVuEBnhpeJRh+jUn6zI4xB eLJ+vzFY11KiGLBEs+Vo+NTHoWccDdIL1qNksJB6kD5X6ZTJdCq6N7SOQWVdb8gho9s3 asDuw2MqNSTnVDaDyyhkegKdI49Lg6UKwWMEejwMa5pHScqYrApAPGqHhnFAPoJPKTtH xIFrfVkit8EL4ln9VNJZJMuiwQTAMqkKTKlTNMIDE5iCm3tHZMhtf16/9qOOMMJvhFSV 9cuB6P15bBs41//aiCMkM0RIzwScR3+LcMgZwLTqFT8JxDu2CXQLrex2dXG6/Q0ZCAuc 1G0g== X-Gm-Message-State: AO0yUKXv+WfXl5uTctqIPeHVEW1BLAooYY23zDkRx1usXRMQKJbVnw0G zcKAtE/q1STFrG9iKQzQ6VE9MoxZrBUABsM3JfY= X-Google-Smtp-Source: AK7set8UZ/4twTooH/hkqizOCnn2bCu/WEjK3xl0vjYmVyTXyYfOsgP3cJd/v02E8eAPmAnxsnBgbSeY6/3mOngEF3U= X-Received: by 2002:a25:9e86:0:b0:8c2:240e:bd05 with SMTP id p6-20020a259e86000000b008c2240ebd05mr545826ybq.359.1676163641939; Sat, 11 Feb 2023 17:00:41 -0800 (PST) MIME-Version: 1.0 References: <20230131213655.4033602-1-goldstein.w.n@gmail.com> <20230131234656.2175991-1-goldstein.w.n@gmail.com> In-Reply-To: From: Sunil Pandey Date: Sat, 11 Feb 2023 17:00:06 -0800 Message-ID: Subject: Re: [PATCH v2] x86: Fix strncat-avx2.S reading past length [BZ #30065] To: "Carlos O'Donell" , Libc-stable Mailing List Cc: Noah Goldstein , libc-alpha@sourceware.org, hjl.tools@gmail.com, carlos@systemhalted.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Tue, Jan 31, 2023 at 7:10 PM Carlos O'Donell via Libc-alpha wrote: > > On 1/31/23 18:46, Noah Goldstein via Libc-alpha wrote: > > Occurs when `src` has no null-term. > > This has been pushed as b2c474f8de4c92bfe7435853a96805ec32d68dfa. > > We are now in a hard freeze as I prepare to cut the release. > > Please do not commit anything further. > > If we find other issues we can backport to the release branch after testing. > > I'm re-running testing with this patch included for x86_64 and i686. > > > Two cases: > > > > 1) Zero-length check is doing: > > ``` > > test %rdx, %rdx > > jl L(zero_len) > > ``` > > which doesn't actually check zero (was at some point `decq` and the > > flag never got updated). > > > > The fix is just make the flag `jle` i.e: > > ``` > > test %rdx, %rdx > > jle L(zero_len) > > ``` > > > > 2) Length check in page-cross case checking if we should continue is > > doing: > > ``` > > cmpq %r8, %rdx > > jb L(page_cross_small) > > ``` > > which means we will continue searching for null-term if length ends at > > the end of a page and there was no null-term in `src`. > > > > The fix is to make the flag: > > ``` > > cmpq %r8, %rdx > > jbe L(page_cross_small) > > ``` > > --- > > string/test-strncat.c | 25 ++++++++++++++++++++++++- > > sysdeps/x86_64/multiarch/strncat-avx2.S | 4 ++-- > > 2 files changed, 26 insertions(+), 3 deletions(-) > > > > diff --git a/string/test-strncat.c b/string/test-strncat.c > > index e03d329e1c..c0cde206ee 100644 > > --- a/string/test-strncat.c > > +++ b/string/test-strncat.c > > @@ -28,6 +28,7 @@ > > # define CHAR char > > # define UCHAR unsigned char > > # define SIMPLE_STRNCAT simple_strncat > > +# define STRNLEN strnlen > > # define STRLEN strlen > > # define MEMSET memset > > # define MEMCPY memcpy > > @@ -40,6 +41,7 @@ > > # define CHAR wchar_t > > # define UCHAR wchar_t > > # define SIMPLE_STRNCAT simple_wcsncat > > +# define STRNLEN wcsnlen > > # define STRLEN wcslen > > # define MEMSET wmemset > > # define MEMCPY wmemcpy > > @@ -78,7 +80,7 @@ do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t n) > > return; > > } > > > > - size_t len = STRLEN (src); > > + size_t len = STRNLEN (src, n); > > if (MEMCMP (dst + k, src, len + 1 > n ? n : len + 1) != 0) > > { > > error (0, 0, "Incorrect concatenation in function %s", > > @@ -95,6 +97,26 @@ do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t n) > > } > > } > > > > +static void > > +do_test_src_no_nullterm_bz30065 (void) > > +{ > > + /* NB: "src does not need to be null-terminated if it contains n or more > > + * bytes." */ > > + CHAR *s1, *s2; > > + size_t bound = page_size / sizeof (CHAR); > > + s1 = (CHAR *) (buf1 + BUF1PAGES * page_size); > > + s2 = (CHAR *) buf2; > > + MEMSET (s1 - bound, -1, bound); > > + for (size_t n = 0; n < bound; ++n) > > + { > > + FOR_EACH_IMPL (impl, 0) > > + { > > + s2[0] = '\0'; > > + do_one_test (impl, s2, s1 - n, n); > > + } > > + } > > +} > > + > > static void > > do_test (size_t align1, size_t align2, size_t len1, size_t len2, > > size_t n, int max_char) > > @@ -372,6 +394,7 @@ test_main (void) > > > > do_random_tests (); > > do_overflow_tests (); > > + do_test_src_no_nullterm_bz30065 (); > > return ret; > > } > > > > diff --git a/sysdeps/x86_64/multiarch/strncat-avx2.S b/sysdeps/x86_64/multiarch/strncat-avx2.S > > index b380e8e11c..c2ff202238 100644 > > --- a/sysdeps/x86_64/multiarch/strncat-avx2.S > > +++ b/sysdeps/x86_64/multiarch/strncat-avx2.S > > @@ -66,7 +66,7 @@ ENTRY(STRNCAT) > > salq $2, %rdx > > # else > > test %rdx, %rdx > > - jl L(zero_len) > > + jle L(zero_len) > > # endif > > vpxor %VZERO_128, %VZERO_128, %VZERO_128 > > > > @@ -387,7 +387,7 @@ L(page_cross): > > subl %esi, %r8d > > andl $(VEC_SIZE - 1), %r8d > > cmpq %r8, %rdx > > - jb L(page_cross_small) > > + jbe L(page_cross_small) > > > > /* Optimizing more aggressively for space as this is very cold > > code. This saves 2x cache lines. */ > > -- > Cheers, > Carlos. > I would like to backport this patch to release branches. Any comments or objections? --Sunil