diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-10-29 22:07:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 12:05:32 +0900 |
| commit | a2f8eb6acf8b40793f3b798b0a63800f38707444 (patch) | |
| tree | 213da3432afe8fe917978755015239ec3aa9448f | |
| parent | 2ca317899d45d60805b0b5dc9b6f879a8f93f7c6 (diff) | |
| download | linux-3.10-a2f8eb6acf8b40793f3b798b0a63800f38707444.tar.gz linux-3.10-a2f8eb6acf8b40793f3b798b0a63800f38707444.tar.bz2 linux-3.10-a2f8eb6acf8b40793f3b798b0a63800f38707444.zip | |
staging: ozwpan: prevent overflow in oz_cdev_write()
commit c2c65cd2e14ada6de44cb527e7f1990bede24e15 upstream.
We need to check "count" so we don't overflow the ei->data buffer.
Reported-by: Nico Golde <nico@ngolde.de>
Reported-by: Fabian Yamaguchi <fabs@goesec.de>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ozwpan/ozcdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c index 27d06666c81..224ccff75d4 100644 --- a/drivers/staging/ozwpan/ozcdev.c +++ b/drivers/staging/ozwpan/ozcdev.c @@ -153,6 +153,9 @@ static ssize_t oz_cdev_write(struct file *filp, const char __user *buf, struct oz_app_hdr *app_hdr; struct oz_serial_ctx *ctx; + if (count > sizeof(ei->data) - sizeof(*elt) - sizeof(*app_hdr)) + return -EINVAL; + spin_lock_bh(&g_cdev.lock); pd = g_cdev.active_pd; if (pd) |