提交 591c5f8a 编写于 作者: I Ian Abbott 提交者: Greg Kroah-Hartman

staging: comedi: avoid bad truncation of a size_t in comedi_write()

At one point in `comedi_write()`, the variable `n` gets assigned to the
minimum of the parameter `nbytes` and the amount of writeable buffer
space.  The way that is done currently is unsafe in the unlikely case
that `nbytes` exceeds `UINT_MAX`, so fix it.
Signed-off-by: NIan Abbott <abbotti@mev.co.uk>
Reviewed-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 84a185ec
...@@ -2357,16 +2357,13 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -2357,16 +2357,13 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
break; break;
} }
n = nbytes; /* Allocate all free buffer space. */
comedi_buf_write_alloc(s, async->prealloc_bufsz);
m = n; m = comedi_buf_write_n_allocated(s);
/* Avoid buffer wraparound. */
if (async->buf_write_ptr + m > async->prealloc_bufsz) if (async->buf_write_ptr + m > async->prealloc_bufsz)
m = async->prealloc_bufsz - async->buf_write_ptr; m = async->prealloc_bufsz - async->buf_write_ptr;
comedi_buf_write_alloc(s, async->prealloc_bufsz); n = min_t(size_t, m, nbytes);
if (m > comedi_buf_write_n_allocated(s))
m = comedi_buf_write_n_allocated(s);
if (m < n)
n = m;
if (n == 0) { if (n == 0) {
if (file->f_flags & O_NONBLOCK) { if (file->f_flags & O_NONBLOCK) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册