| From 5a7a88f1b488e4ee49eb3d5b82612d4d9ffdf2c3 Mon Sep 17 00:00:00 2001 |
| From: "Ismail, Mustafa" <mustafa.ismail@intel.com> |
| Date: Fri, 14 Jul 2017 09:41:30 -0500 |
| Subject: RDMA/uverbs: Fix the check for port number |
| |
| From: Ismail, Mustafa <mustafa.ismail@intel.com> |
| |
| commit 5a7a88f1b488e4ee49eb3d5b82612d4d9ffdf2c3 upstream. |
| |
| The port number is only valid if IB_QP_PORT is set in the mask. |
| So only check port number if it is valid to prevent modify_qp from |
| failing due to an invalid port number. |
| |
| Fixes: 5ecce4c9b17b("Check port number supplied by user verbs cmds") |
| Reviewed-by: Steve Wise <swise@opengridcomputing.com> |
| Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com> |
| Tested-by: Mike Marciniszyn <mike.marciniszyn@intel.com> |
| Signed-off-by: Doug Ledford <dledford@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| |
| --- |
| drivers/infiniband/core/uverbs_cmd.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/infiniband/core/uverbs_cmd.c |
| +++ b/drivers/infiniband/core/uverbs_cmd.c |
| @@ -2342,8 +2342,9 @@ ssize_t ib_uverbs_modify_qp(struct ib_uv |
| if (copy_from_user(&cmd, buf, sizeof cmd)) |
| return -EFAULT; |
| |
| - if (cmd.port_num < rdma_start_port(ib_dev) || |
| - cmd.port_num > rdma_end_port(ib_dev)) |
| + if ((cmd.attr_mask & IB_QP_PORT) && |
| + (cmd.port_num < rdma_start_port(ib_dev) || |
| + cmd.port_num > rdma_end_port(ib_dev))) |
| return -EINVAL; |
| |
| INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd, |
