From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 82F293857BAA; Fri, 5 Aug 2022 19:29:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82F293857BAA Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: Fix invalid pointer deref in wcpcpy_chk X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: dec33ea23fc0550aaa27e32d13ff4478b0b850d1 X-Git-Newrev: 1943345fa37fa56a835152d4020aa239a945a582 Message-Id: <20220805192945.82F293857BAA@sourceware.org> Date: Fri, 5 Aug 2022 19:29:45 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:29:45 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1943345fa37fa56a835152d4020aa239a945a582 commit 1943345fa37fa56a835152d4020aa239a945a582 Author: Szabolcs Nagy Date: Tue Jun 21 15:57:48 2022 +0100 cheri: Fix invalid pointer deref in wcpcpy_chk Accessing src via the dest pointer is invalid. Diff: --- debug/wcpcpy_chk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debug/wcpcpy_chk.c b/debug/wcpcpy_chk.c index bc2be43c3e..d44fb479d0 100644 --- a/debug/wcpcpy_chk.c +++ b/debug/wcpcpy_chk.c @@ -28,13 +28,12 @@ __wcpcpy_chk (wchar_t *dest, const wchar_t *src, size_t destlen) { wchar_t *wcp = (wchar_t *) dest - 1; wint_t c; - const ptrdiff_t off = src - dest + 1; do { if (__glibc_unlikely (destlen-- == 0)) __chk_fail (); - c = wcp[off]; + c = *src++; *++wcp = c; } while (c != L'\0');