| Message ID | 1453134547-13875-1-git-send-email-wuninsu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18/01/16 16:38, David Vrabel wrote: > On 18/01/16 16:29, Insu Yun wrote: >> When len is greater than UINT_MAX - sizeof(*rb), in next allocation, >> it can overflow integer range and allocates small size of heap. >> After that, memcpy will overflow the allocated heap. >> Therefore, it needs to check the size of given length. > [...] >> --- a/drivers/xen/xenbus/xenbus_dev_frontend.c >> +++ b/drivers/xen/xenbus/xenbus_dev_frontend.c >> @@ -186,7 +186,7 @@ static int queue_reply(struct list_head *queue, const void *data, size_t len) >> { >> struct read_buffer *rb; >> >> - if (len == 0) >> + if (len == 0 || len >= UINT_MAX - sizeof(*rb)) > ^^^^^^^^^^^^^^^^^^^^^^ > Please check > > len > XENSTORE_PAYLOAD_MAX > > instead. And return -EINVAL in this case (not zero). David
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c index 9433e46..b45ed69 100644 --- a/drivers/xen/xenbus/xenbus_dev_frontend.c +++ b/drivers/xen/xenbus/xenbus_dev_frontend.c @@ -186,7 +186,7 @@ static int queue_reply(struct list_head *queue, const void *data, size_t len) { struct read_buffer *rb; - if (len == 0) + if (len == 0 || len >= UINT_MAX - sizeof(*rb)) return 0; rb = kmalloc(sizeof(*rb) + len, GFP_KERNEL);
When len is greater than UINT_MAX - sizeof(*rb), in next allocation, it can overflow integer range and allocates small size of heap. After that, memcpy will overflow the allocated heap. Therefore, it needs to check the size of given length. Signed-off-by: Insu Yun <wuninsu@gmail.com> --- drivers/xen/xenbus/xenbus_dev_frontend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)