kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix stack buffer overflow

Browse source 
https://hackerone.com/reports/1306859
This commit is contained in:
Nobuyoshi Nakada 2021-08-17 22:01:57 +09:00
parent 9873af0b1a
commit bcc2bb28b0
Notes: git 2021-12-10 01:05:21 +09:00 
Merged: https://github.com/ruby/ruby/pull/5239
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ruby/internal/memory.h
View file

@ -284,7 +284,7 @@ typedef uint128_t DSIZE_T;
* @return A pointer on stack. * @return A pointer on stack.
*/ */
#define ALLOCA_N(type,n) \ #define ALLOCA_N(type,n) \
RBIMPL_CAST((type *)alloca(rbimpl_size_mul_or_raise(sizeof(type), (n)))) RBIMPL_CAST((type *)(!(n) ? NULL : alloca(rbimpl_size_mul_or_raise(sizeof(type), (n)))))
/** /**
* Identical to #RB_ALLOCV_N(), except it implicitly assumes the type of array * Identical to #RB_ALLOCV_N(), except it implicitly assumes the type of array
@ -297,7 +297,7 @@ typedef uint128_t DSIZE_T;
*/ */
#define RB_ALLOCV(v, n) \ #define RB_ALLOCV(v, n) \
((n) < RUBY_ALLOCV_LIMIT ? \ ((n) < RUBY_ALLOCV_LIMIT ? \
((v) = 0, alloca(n)) : \ ((v) = 0, !(n) ? NULL : alloca(n)) : \
rb_alloc_tmp_buffer(&(v), (n))) rb_alloc_tmp_buffer(&(v), (n)))
/** /**
@ -330,7 +330,7 @@ typedef uint128_t DSIZE_T;
#define RB_ALLOCV_N(type, v, n) \ #define RB_ALLOCV_N(type, v, n) \
RBIMPL_CAST((type *) \ RBIMPL_CAST((type *) \
(((size_t)(n) < RUBY_ALLOCV_LIMIT / sizeof(type)) ? \ (((size_t)(n) < RUBY_ALLOCV_LIMIT / sizeof(type)) ? \
((v) = 0, alloca((n) * sizeof(type))) : \ ((v) = 0, !(n) ? NULL : alloca((n) * sizeof(type))) : \
rb_alloc_tmp_buffer2(&(v), (n), sizeof(type)))) rb_alloc_tmp_buffer2(&(v), (n), sizeof(type))))
/** /**

7
random.c
View file

@ -365,15 +365,12 @@ rand_init(const rb_random_interface_t *rng, rb_random_t *rnd, VALUE seed)
int sign; int sign;
len = rb_absint_numwords(seed, 32, NULL); len = rb_absint_numwords(seed, 32, NULL);
if (len == 0) len = 1;
buf = ALLOCV_N(uint32_t, buf0, len); buf = ALLOCV_N(uint32_t, buf0, len);
sign = rb_integer_pack(seed, buf, len, sizeof(uint32_t), 0, sign = rb_integer_pack(seed, buf, len, sizeof(uint32_t), 0,
INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER); INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
if (sign < 0) if (sign < 0)
sign = -sign; sign = -sign;
if (len == 0) {
buf[0] = 0;
len = 1;
}
if (len > 1) { if (len > 1) {
if (sign != 2 && buf[len-1] == 1) /* remove leading-zero-guard */ if (sign != 2 && buf[len-1] == 1) /* remove leading-zero-guard */
len--; len--;
@ -883,7 +880,7 @@ rand_mt_init(rb_random_t *rnd, const uint32_t *buf, size_t len)
{ {
struct MT *mt = &((rb_random_mt_t *)rnd)->mt; struct MT *mt = &((rb_random_mt_t *)rnd)->mt;
if (len <= 1) { if (len <= 1) {
init_genrand(mt, buf[0]); init_genrand(mt, len ? buf[0] : 0);
} }
else { else {
init_by_array(mt, buf, (int)len); init_by_array(mt, buf, (int)len);