From: Robert T. Johnson <rtjohnso@eecs.berkeley.edu>
Date: Tue, 17 Jun 2008 00:20:52 +0000 (-0700)
Subject: atm: [he] limit queries to the device's register space
X-Git-Tag: v2.6.26-rc7~20^2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=28e84ab3abafb0f9c9573993626abe6ca3fa8eb1;p=linux-2.6-omap-h63xx.git

atm: [he] limit queries to the device's register space

From: "Robert T. Johnson" <rtjohnso@eecs.berkeley.edu>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
---

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 320320e3dfb..fc636a3429c 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2845,10 +2845,15 @@ he_ioctl(struct atm_dev *atm_dev, unsigned int cmd, void __user *arg)
 			if (copy_from_user(&reg, arg,
 					   sizeof(struct he_ioctl_reg)))
 				return -EFAULT;
-			
+
 			spin_lock_irqsave(&he_dev->global_lock, flags);
 			switch (reg.type) {
 				case HE_REGTYPE_PCI:
+					if (reg.addr < 0 || reg.addr >= HE_REGMAP_SIZE) {
+						err = -EINVAL;
+						break;
+					}
+
 					reg.val = he_readl(he_dev, reg.addr);
 					break;
 				case HE_REGTYPE_RCM: