From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 88C7A3857001; Fri, 28 Oct 2022 10:18:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88C7A3857001 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666952307; bh=5K/Is2dg8FXvCVDVFBBJOxvZrrvNweegfOebzJMEc1Q=; h=From:To:Subject:Date:From; b=LpT5lv7fJgc5wL1nuKXqDfw4advELxTiAV2Zo5k0+EcGnr51cKWzlceEp23nEBrRQ qUeTcss0d6WnFuigawM1Du7o0mBNj8AIhrsn+XH08zuvubiXeBwYADOR2k48jJ0CRQ JnDWarY1+UcNxpgImrXo2q61YEU6rkixfVNPgLr8= 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] Fix invalid pointer dereference in wcscpy_chk X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/master X-Git-Oldrev: 09c6c6073c925235b385af1d8edf6bc853eeaf60 X-Git-Newrev: e5ece9de1417ac33c755226f3dd962fc2c7d97aa Message-Id: <20221028101827.88C7A3857001@sourceware.org> Date: Fri, 28 Oct 2022 10:18:27 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e5ece9de1417ac33c755226f3dd962fc2c7d97aa commit e5ece9de1417ac33c755226f3dd962fc2c7d97aa 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. Reviewed-by: Florian Weimer 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; }