|
|
@@ -49,6 +49,7 @@
|
|
|
#include <linux/sched.h>
|
|
|
#include <linux/semaphore.h>
|
|
|
#include <linux/slab.h>
|
|
|
+#include <linux/nospec.h>
|
|
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
|
|
@@ -868,11 +869,14 @@ static int ib_umad_unreg_agent(struct ib_umad_file *file, u32 __user *arg)
|
|
|
|
|
|
if (get_user(id, arg))
|
|
|
return -EFAULT;
|
|
|
+ if (id >= IB_UMAD_MAX_AGENTS)
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
mutex_lock(&file->port->file_mutex);
|
|
|
mutex_lock(&file->mutex);
|
|
|
|
|
|
- if (id >= IB_UMAD_MAX_AGENTS || !__get_agent(file, id)) {
|
|
|
+ id = array_index_nospec(id, IB_UMAD_MAX_AGENTS);
|
|
|
+ if (!__get_agent(file, id)) {
|
|
|
ret = -EINVAL;
|
|
|
goto out;
|
|
|
}
|