diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:13 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:13 +0800 |
| commit | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (patch) | |
| tree | f3715d78e72389582ce2ad5dc5c59051f1814b4b /drivers/infiniband/core/uverbs_main.c | |
| parent | 03d8016839b087e141e26472fabcf860bc05cf7d (diff) | |
| parent | e429f243df2823451c92227317e5fce5f310b674 (diff) | |
Merge tag 'v4.1.25' into linux-linaro-lsk-v4.1lsk-v4.1-16.05
This is the 4.1.25 stable release
Diffstat (limited to 'drivers/infiniband/core/uverbs_main.c')
| -rw-r--r-- | drivers/infiniband/core/uverbs_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index 09686d49d4c1..e063b07de170 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -48,6 +48,8 @@ #include <asm/uaccess.h> +#include <rdma/ib.h> + #include "uverbs.h" MODULE_AUTHOR("Roland Dreier"); @@ -613,6 +615,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, struct ib_uverbs_cmd_hdr hdr; __u32 flags; + if (WARN_ON_ONCE(!ib_safe_file_access(filp))) + return -EACCES; + if (count < sizeof hdr) return -EINVAL; |