From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id A1097385151D; Thu, 27 Oct 2022 13:48:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1097385151D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878534; bh=w4NIwqTzxsrq13DrVGJatQ+FbHV3/4+Tq3pitmFvOm8=; h=From:To:Subject:Date:From; b=Rxy55znqpfreVl6E/KN4RSSiCR+gVwlFDXbhUtP6C96lTZ7VHiBRqVZptD9YboMUZ pLaqZw/yDMs4dmh6dE4l3wGQLZgG9XOD9YTJkw4CUDUpxKJJyRb4+BaYHzMv47RW/k aghASpHmt/+JLDbJYVDlVW/gT2zACzTCMPo1nsx0= 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] Fix invalid pointer dereference in wcscpy_chk X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: d549598009b8f9b795b8d6359f0b2b27418221e3 X-Git-Newrev: 36cb53c9c848cba09e609f136689943e445d6d36 Message-Id: <20221027134854.A1097385151D@sourceware.org> Date: Thu, 27 Oct 2022 13:48:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=36cb53c9c848cba09e609f136689943e445d6d36 commit 36cb53c9c848cba09e609f136689943e445d6d36 Author: Szabolcs Nagy Date: Tue Jun 21 14:43:30 2022 +0100 Fix invalid pointer dereference in wcscpy_chk The src pointer is const and points to a different object, so accessing dest via src is invalid. Diff: --- debug/wcscpy_chk.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/debug/wcscpy_chk.c b/debug/wcscpy_chk.c index 8ef03f81e4..d2dc769181 100644 --- a/debug/wcscpy_chk.c +++ b/debug/wcscpy_chk.c @@ -24,36 +24,16 @@ wchar_t * __wcscpy_chk (wchar_t *dest, const wchar_t *src, size_t n) { wint_t c; - wchar_t *wcp; + wchar_t *wcp = dest; - if (__alignof__ (wchar_t) >= sizeof (wchar_t)) + do { - const ptrdiff_t off = dest - src - 1; - - wcp = (wchar_t *) src; - - do - { - if (__glibc_unlikely (n-- == 0)) - __chk_fail (); - c = *wcp++; - wcp[off] = c; - } - while (c != L'\0'); - } - else - { - wcp = dest; - - do - { - if (__glibc_unlikely (n-- == 0)) - __chk_fail (); - c = *src++; - *wcp++ = c; - } - while (c != L'\0'); + if (__glibc_unlikely (n-- == 0)) + __chk_fail (); + c = *src++; + *wcp++ = c; } + while (c != L'\0'); return dest; }