AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-13 06:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
0d5b36c8cc
glibc/misc
History
Joan Bruguera ca0faa140f misc: Fix rare fortify crash on wchar funcs. [BZ 29030] 
If `__glibc_objsize (__o) == (size_t) -1` (i.e. `__o` is unknown size), fortify
checks should pass, and `__whatever_alias` should be called.

Previously, `__glibc_objsize (__o) == (size_t) -1` was explicitly checked, but
on commit a643f60c53, this was moved into `__glibc_safe_or_unknown_len`.

A comment says the -1 case should work as: "The -1 check is redundant because
since it implies that __glibc_safe_len_cond is true.". But this fails when:
* `__s > 1`
* `__osz == -1` (i.e. unknown size at compile time)
* `__l` is big enough
* `__l * __s <= __osz` can be folded to a constant
(I only found this to be true for `mbsrtowcs` and other functions in wchar2.h)

In this case `__l * __s <= __osz` is false, and `__whatever_chk_warn` will be
called by `__glibc_fortify` or `__glibc_fortify_n` and crash the program.

This commit adds the explicit `__osz == -1` check again.
moc crashes on startup due to this, see: https://bugs.archlinux.org/task/74041

Minimal test case (test.c):
    #include <wchar.h>

    int main (void)
    {
        const char *hw = "HelloWorld";
        mbsrtowcs (NULL, &hw, (size_t)-1, NULL);
        return 0;
    }

Build with:
    gcc -O2 -Wp,-D_FORTIFY_SOURCE=2 test.c -o test && ./test

Output:
    *** buffer overflow detected ***: terminated

Fixes: BZ #29030
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
(cherry picked from commit 33e03f9cd2)
2022-04-25 18:44:27 +05:30
..
bits Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sys misc: Fix rare fortify crash on wchar funcs. [BZ 29030] 2022-04-25 18:44:27 +05:30
acct.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
allocate_once.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ar.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
brk.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
bug18240.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
bug-hsearch1.c .. 2009-01-23 20:41:36 +00:00
chflags.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
chroot.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
daemon.c Remove internal usage of extensible stat functions 2020-09-11 14:35:32 -03:00
dirname.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
efgcvt_r-template.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
efgcvt_r.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
efgcvt-dbl-macros.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
efgcvt-ldbl-macros.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
efgcvt-template.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
efgcvt.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
err.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
err.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
error.c nptl: Move pthread_setcancelstate into libc 2021-04-21 19:49:50 +02:00
error.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
fchflags.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
fd_to_filename.c misc: use _fitoa_word to implement __fd_to_filename. 2021-05-07 13:54:36 -03:00
fdatasync.c Add hidden prototypes for fsync, fdatasync 2021-06-22 09:51:14 +02:00
fgetxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
flistxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
fremovexattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
fsetxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
fstab.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
fstab.h Remove pre-ISO C support 2012-01-07 23:57:22 -05:00
fsync.c Add hidden prototypes for fsync, fdatasync 2021-06-22 09:51:14 +02:00
ftruncate64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ftruncate.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
futimes.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
futimesat.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getauxval.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getclktck.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getdomain.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getdtsz.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
gethostid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
gethostname.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getloadavg.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getpagesize.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getpass.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
getsysstats.c misc: Add __get_nprocs_sched 2021-10-01 18:19:09 +02:00
getttyent.c Fix -Os getc_unlocked linknamespace, localplt issues (bug 15105, bug 19463). 2018-02-21 18:01:11 +00:00
getusershell.c Remove internal usage of extensible stat functions 2020-09-11 14:35:32 -03:00
getxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
gtty.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
hsearch_r.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
hsearch.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ifunc-impl-list.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
init-misc.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
insremque.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ioctl.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
lgetxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
libgen.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
listxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
llistxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
lremovexattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
lsearch.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
lsetxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
lutimes.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
madvise.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
makedev.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
Makefile Move malloc hooks into a compat DSO 2021-07-22 18:37:59 +05:30
mincore.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkdtemp.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkostemp64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkostemp.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkostemps64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkostemps.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkstemp64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkstemp.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkstemps64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mkstemps.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mktemp.c nptl: Move sem_close, sem_open into libc 2021-05-05 17:19:38 +02:00
mlock.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mlockall.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mmap64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mmap.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mntent_r.c mntent: Use __putc_unlocked instead of fputc_unlocked 2021-01-08 21:02:12 +05:30
mntent.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mntent.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
mprotect.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
msync.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
munlock.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
munlockall.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
munmap.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
preadv2.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
preadv64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
preadv64v2.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
preadv.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
pselect.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ptrace.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
pwritev2.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
pwritev64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
pwritev64v2.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
pwritev.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
qefgcvt_r.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
qefgcvt.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
readv.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
reboot.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
regexp.c Force building with -fno-common 2021-07-09 20:09:14 +02:00
regexp.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
remap_file_pages.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
removexattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
revoke.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sbrk.c Use hidden visibility for early static PIE code 2021-01-21 15:55:01 +00:00
search.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
select.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
setdomain.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
setegid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
seteuid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sethostid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sethostname.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
setregid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
setreuid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
setxattr.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sgtty.h Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
single_threaded.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sstk.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
stab.h
stty.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
swapoff.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
swapon.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
sync.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
syncfs.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
syscall.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
syscall.h
sysexits.h
syslog.c misc: syslog: Use static const for AF_UNIX address 2021-04-15 11:32:40 -03:00
syslog.h
truncate64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
truncate.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tsearch.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-allocate_once.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-atomic-long.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-atomic.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-dbl-efgcvt.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-dirname.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-efgcvt-template.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-empty.c Move all tests out of the csu subdirectory 2016-12-21 11:52:19 +01:00
tst-error1.c Split DIAG_* macros to new header libc-diag.h. 2017-02-25 09:59:46 -05:00
tst-fd_to_filename.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-fdset.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-gethostid.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-hsearch.c Modify several tests to use test-skeleton.c 2014-11-05 15:24:08 +05:30
tst-insremque.c [BZ #2766] 2006-06-17 17:01:42 +00:00
tst-ioctl-time64.c misc: Add time64 alias for ioctl 2021-07-21 11:58:09 +02:00
tst-ioctl.c misc: Add time64 alias for ioctl 2021-07-21 11:58:09 +02:00
tst-ldbl-efgcvt.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-ldbl-error.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-ldbl-warn.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-makedev.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-mntent2.c Fix warning in misc/tst-mntent2.c. 2014-12-16 10:27:16 +01:00
tst-mntent-autofs.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-mntent-blank-corrupt.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-mntent-blank-passno.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-mntent-escape.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-mntent.c getmntent: fix memory corruption w/blank lines [BZ #18887] 2015-08-29 18:07:00 -04:00
tst-preadvwritev2-common.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-preadvwritev2.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-preadvwritev64.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-preadvwritev64v2.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-preadvwritev-common.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-preadvwritev.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-pselect-time64.c y2038: Add test coverage 2021-06-15 10:42:11 -03:00
tst-pselect.c linux: Only use 64-bit syscall if required for pselect 2021-06-22 12:09:52 -03:00
tst-select-time64.c y2038: Add test coverage 2021-06-15 10:42:11 -03:00
tst-select.c linux: Only use 64-bit syscall if required for select 2021-06-22 12:09:52 -03:00
tst-syscalls.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-tsearch.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
tst-warn-wide.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ttyent.h Remove pre-ISO C support 2012-01-07 23:57:22 -05:00
ttyslot.c As a minor cleanup remove the (r)index defines from include/string.h as 2017-02-06 18:15:18 +00:00
ualarm.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
unwind-link.c Implement <unwind-link.h> for dynamically loading the libgcc_s unwinder 2021-03-01 15:58:01 +01:00
usleep.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
ustat.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
utimes.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
Versions Implement <unwind-link.h> for dynamically loading the libgcc_s unwinder 2021-03-01 15:58:01 +01:00
vhangup.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00
writev.c Update copyright dates with scripts/update-copyrights 2021-01-02 12:17:34 -08:00