Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1272422

[PATCH 4/8] staging: comedi: avoid bad truncation of a size_t in comedi_write()

Show all headers | View raw

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: Ian Abbott <abbotti@mev.co.uk>
---
 drivers/staging/comedi/comedi_fops.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 188a12a..8c784c4 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2357,16 +2357,13 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
 			break;
 		}
 
-		n = nbytes;
-
-		m = n;
+		/* Allocate all free buffer space. */
+		comedi_buf_write_alloc(s, async->prealloc_bufsz);
+		m = comedi_buf_write_n_allocated(s);
+		/* Avoid buffer wraparound. */
 		if (async->buf_write_ptr + m > async->prealloc_bufsz)
 			m = async->prealloc_bufsz - async->buf_write_ptr;
-		comedi_buf_write_alloc(s, async->prealloc_bufsz);
-		if (m > comedi_buf_write_n_allocated(s))
-			m = comedi_buf_write_n_allocated(s);
-		if (m < n)
-			n = m;
+		n = min_t(size_t, m, nbytes);
 
 		if (n == 0) {
 			if (file->f_flags & O_NONBLOCK) {
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] staging: comedi: some comedi_write() changes Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
  [PATCH 1/8] staging: comedi: rearrange comedi_write() code Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
    RE: [PATCH 1/8] staging: comedi: rearrange comedi_write() code Hartley Sweeten <HartleyS@visionengravers.com> - 2015-11-19 18:10 +0100
  [PATCH 5/8] staging: comedi: allow buffer wraparound in comedi_write() Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
  [PATCH 8/8] staging: comedi: check for more errors for zero-length write Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
  [PATCH 4/8] staging: comedi: avoid bad truncation of a size_t in comedi_write() Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
  [PATCH 6/8] staging: comedi: return error on "write" if no command set up Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
  [PATCH 7/8] staging: comedi: simplify returned errors for comedi_write() Ian Abbott <abbotti@mev.co.uk> - 2015-11-18 19:00 +0100
  RE: [PATCH 0/8] staging: comedi: some comedi_write() changes Hartley Sweeten <HartleyS@visionengravers.com> - 2015-11-19 18:40 +0100

csiph-web