summaryrefslogtreecommitdiff
path: root/drivers/uio
diff options
context:
space:
mode:
authorHillf Danton <dhillf@gmail.com>2011-03-31 20:38:47 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-19 16:56:03 -0700
commitc6edc42fe1b5562abae22beabbebd9e557527ae3 (patch)
tree757c9373b57ad7ca60925b0aec83bf60d0de953e /drivers/uio
parentf0c554fddd3be561542cd37acdb3adc9ec5483ee (diff)
uio: fix allocating minor id for uio device
The number of uio devices that could be used should be less than UIO_MAX_DEVICES by design, and this work guards any cases in which id more than UIO_MAX_DEVICES is utilized. Signed-off-by: Hillf Danton <dhillf@gmail.com> Signed-off-by: Hans J. Koch <hjk@hansjkoch.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 10a029b24159..d2efe823c20d 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -381,7 +381,13 @@ static int uio_get_minor(struct uio_device *idev)
retval = -ENOMEM;
goto exit;
}
- idev->minor = id & MAX_ID_MASK;
+ if (id < UIO_MAX_DEVICES) {
+ idev->minor = id;
+ } else {
+ dev_err(idev->dev, "too many uio devices\n");
+ retval = -EINVAL;
+ idr_remove(&uio_idr, id);
+ }
exit:
mutex_unlock(&minor_lock);
return retval;