py/objdeque: Protect against negative maxlen in deque constructor.

Otherwise passing -1 as maxlen will lead to a zero allocation and
subsequent unbound buffer overflow in deque.append() because i_put is
allowed to grow without bound.
This commit is contained in:
Damien George 2018-02-21 23:34:17 +11:00
parent 8f9b113be2
commit 160d670868
2 changed files with 13 additions and 1 deletions

View File

@ -50,9 +50,15 @@ STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t
mp_raise_ValueError(NULL); mp_raise_ValueError(NULL);
} }
// Protect against -1 leading to zero-length allocation and bad array access
mp_int_t maxlen = mp_obj_get_int(args[1]);
if (maxlen < 0) {
mp_raise_ValueError(NULL);
}
mp_obj_deque_t *o = m_new_obj(mp_obj_deque_t); mp_obj_deque_t *o = m_new_obj(mp_obj_deque_t);
o->base.type = type; o->base.type = type;
o->alloc = mp_obj_get_int(args[1]) + 1; o->alloc = maxlen + 1;
o->i_get = o->i_put = 0; o->i_get = o->i_put = 0;
o->items = m_new(mp_obj_t, o->alloc); o->items = m_new(mp_obj_t, o->alloc);
mp_seq_clear(o->items, 0, o->alloc, sizeof(*o->items)); mp_seq_clear(o->items, 0, o->alloc, sizeof(*o->items));

View File

@ -55,6 +55,12 @@ d.append(4)
d.append(5) d.append(5)
print(d.popleft(), d.popleft()) print(d.popleft(), d.popleft())
# Negative maxlen is not allowed
try:
deque((), -1)
except ValueError:
print("ValueError")
# Unsupported unary op # Unsupported unary op
try: try:
~d ~d