---

yaml --- r: 98230 b: refs/heads/master c: 28e84ab h: refs/heads/master v: v3
git-mirror · Jun 17, 2008 · 7ac2322 · 7ac2322
1 parent 168f0cb
commit 7ac2322
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e903c2ae36efb526eacab3b25d00e90424bd8a8
+refs/heads/master: 28e84ab3abafb0f9c9573993626abe6ca3fa8eb1
diff --git a/trunk/drivers/atm/he.c b/trunk/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: