AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(public_cALLOc): Check for overflow on multiplication.

Browse Source
This commit is contained in:
Ulrich Drepper 2002-08-02 01:27:46 +00:00
parent d7e1ad053b
commit 0950889b81
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linuxthreads/sysdeps/i386/pspinlock.c
View File

@ -1,5 +1,5 @@
/* POSIX spinlock implementation. x86 version. /* POSIX spinlock implementation. x86 version.
Copyright (C) 2000 Free Software Foundation, Inc. Copyright (C) 2000, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -20,6 +20,8 @@
#include <errno.h> #include <errno.h>
#include <pthread.h> #include <pthread.h>
#include "internals.h" #include "internals.h"
#include "kernel-features.h"
/* This implementation is similar to the one used in the Linux kernel. /* This implementation is similar to the one used in the Linux kernel.
But the kernel is byte instructions for the memory access. This is But the kernel is byte instructions for the memory access. This is
@ -95,3 +97,7 @@ __pthread_spin_destroy (pthread_spinlock_t *lock)
return 0; return 0;
} }
weak_alias (__pthread_spin_destroy, pthread_spin_destroy) weak_alias (__pthread_spin_destroy, pthread_spin_destroy)
#ifndef __ASSUME_SET_THREAD_AREA_SYSCALL
int __have_no_set_thread_area;
#endif

16
malloc/malloc.c
View File

@ -3452,16 +3452,23 @@ public_cALLOc(size_t n, size_t elem_size)
{ {
mstate av; mstate av;
mchunkptr oldtop, p; mchunkptr oldtop, p;
INTERNAL_SIZE_T sz, csz, oldtopsize; INTERNAL_SIZE_T bytes, sz, csz, oldtopsize;
Void_t* mem; Void_t* mem;
unsigned long clearsize; unsigned long clearsize;
unsigned long nclears; unsigned long nclears;
INTERNAL_SIZE_T* d; INTERNAL_SIZE_T* d;
__malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, __const __malloc_ptr_t)) = __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, __const __malloc_ptr_t)) =
__malloc_hook; __malloc_hook;
/* size_t is unsigned so the behavior on overflow is defined. */
bytes = n * elem_size;
if (bytes / elem_size != n) {
MALLOC_FAILURE_ACTION;
return 0;
}
if (hook != NULL) { if (hook != NULL) {
sz = n * elem_size; sz = bytes;
mem = (*hook)(sz, RETURN_ADDRESS (0)); mem = (*hook)(sz, RETURN_ADDRESS (0));
if(mem == 0) if(mem == 0)
return 0; return 0;
@ -3473,8 +3480,7 @@ public_cALLOc(size_t n, size_t elem_size)
#endif #endif
} }
/* FIXME: check for overflow on multiplication. */ sz = bytes;
sz = n * elem_size;
arena_get(av, sz); arena_get(av, sz);
if(!av) if(!av)

8
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -1,6 +1,6 @@
/* Set flags signalling availability of kernel features based on given /* Set flags signalling availability of kernel features based on given
kernel version number. kernel version number.
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -184,6 +184,12 @@
# define __ASSUME_MMAP2_SYSCALL 1 # define __ASSUME_MMAP2_SYSCALL 1
#endif #endif
/* On x86, the set_thread_area syscall was introduced in 2.5.29, but its
semantics was changed in 2.5.30. */
#if __LINUX_KERNEL_VERSION >= 132382 && defined __i386__
# define __ASSUME_SET_THREAD_AREA_SYSCALL 1
#endif
/* There are an infinite number of PA-RISC kernel versions numbered /* There are an infinite number of PA-RISC kernel versions numbered
2.4.0. But they've not really been released as such. We require 2.4.0. But they've not really been released as such. We require
and expect the final version here. */ and expect the final version here. */