Changeset ab49a0d in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2010-12-23T16:11:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

467bf40, 77cea41

Parents:

8dd039a (diff), 8240dc5a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/ipc/irq.c (modified) (4 diffs)

kernel/generic/src/ipc/irq.c

@@ -131 +131 @@
 /** Register an answerbox as a receiving end for IRQ notifications.
  *
- * @param box     Receiving answerbox.
- * @param inr     IRQ number.
- * @param devno   Device number.
- * @param imethod Interface and method to be associated
- *                with the notification.
- * @param ucode   Uspace pointer to top-half pseudocode.
- *
- * @return EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
+ * @param box           Receiving answerbox.
+ * @param inr           IRQ number.
+ * @param devno         Device number.
+ * @param imethod       Interface and method to be associated with the
+ *                      notification.
+ * @param ucode         Uspace pointer to top-half pseudocode.
+ * @return              EOK on success or a negative error code.
  *
  */
@@ -148 +147 @@
                 (sysarg_t) devno
         };
+
+        if ((inr < 0) || (inr > last_inr))
+                return ELIMIT;
         
         irq_code_t *code;
@@ -208 +210 @@
 /** Unregister task from IRQ notification.
  *
- * @param box   Answerbox associated with the notification.
- * @param inr   IRQ number.
- * @param devno Device number.
- *
+ * @param box           Answerbox associated with the notification.
+ * @param inr           IRQ number.
+ * @param devno         Device number.
+ * @return              EOK on success or a negative error code.
  */
 int ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno)
@@ -219 +221 @@
                 (sysarg_t) devno
         };
+
+        if ((inr < 0) || (inr > last_inr))
+                return ELIMIT;
         
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);