3.2.95-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: "Ismail, Mustafa" <[email protected]> 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 <[email protected]> Signed-off-by: Mustafa Ismail <[email protected]> Tested-by: Mike Marciniszyn <[email protected]> Signed-off-by: Doug Ledford <[email protected]> [bwh: Backported to 3.2: command structure is cmd not cmd->base] Signed-off-by: Ben Hutchings <[email protected]> --- drivers/infiniband/core/uverbs_cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -1790,7 +1790,8 @@ ssize_t ib_uverbs_modify_qp(struct ib_uv goto out; } - if (!rdma_is_port_valid(qp->device, cmd.port_num)) { + if ((cmd.attr_mask & IB_QP_PORT) && + !rdma_is_port_valid(qp->device, cmd.port_num)) { ret = -EINVAL; goto release_qp; }
