public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Fix invalid pointer dereference in wcscpy_chk
@ 2022-10-28 10:18 Szabolcs Nagy
0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2022-10-28 10:18 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e5ece9de1417ac33c755226f3dd962fc2c7d97aa
commit e5ece9de1417ac33c755226f3dd962fc2c7d97aa
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
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 <fweimer@redhat.com>
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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-28 10:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-28 10:18 [glibc] Fix invalid pointer dereference in wcscpy_chk Szabolcs Nagy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).