From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7F77C43461 for ; Thu, 10 Sep 2020 14:03:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78E8521941 for ; Thu, 10 Sep 2020 14:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599746631; bh=FKhd4ybJxV1wErp2KZudqOkxEUyxFXgZWke6Azncq9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b/HTN/t2/v4EUIxjfd5OYzTQLJaAPOtmqI8fbzN+knCYTAUte8sZ1/IpQZUnJAX+Q Y5we1MY1JVJtAY+J9YP8FN5sDfFWbFdtVib5hcmk3McENXB/XrwX+w8RAhNNvXFmPq NO58Qbj4sMz6YlpS+dxkWRMl2spB1Z9xBapPptLQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730880AbgIJODh (ORCPT ); Thu, 10 Sep 2020 10:03:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:38636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731007AbgIJOCp (ORCPT ); Thu, 10 Sep 2020 10:02:45 -0400 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C2D721D92; Thu, 10 Sep 2020 14:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599746472; bh=FKhd4ybJxV1wErp2KZudqOkxEUyxFXgZWke6Azncq9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L6wfEmOpw1ueWyWj5eLILpu/CmuPFCyjoeiP+26QGBguTlVyTRUSHsk5lu7XTKWkt X4nVJwJHbEhYYIpEc64AwAe/TvRA1wK5y1XISRwy9d1bz5UrGpwKgldPWJ1m9SgkjI i0Q1dhbBvg3qr2bv3EV3yKm1EFh4AlGvV/R0w8aQ= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , linux-rdma@vger.kernel.org, Maor Gottlieb Subject: [PATCH rdma-next 07/10] RDMA/core: Align write and ioctl checks of QP types Date: Thu, 10 Sep 2020 17:00:43 +0300 Message-Id: <20200910140046.1306341-8-leon@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910140046.1306341-1-leon@kernel.org> References: <20200910140046.1306341-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky The ioctl flow checks that the user provides only a supported list of QP types, while write flow didn't do it and relied on the driver to check it. Align those flows to fail as early as possible. Reviewed-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/uverbs_cmd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 408a1a4b67f6..b4e383505eda 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -1275,8 +1275,21 @@ static int create_qp(struct uverbs_attr_bundle *attrs, bool has_sq = true; struct ib_device *ib_dev; - if (cmd->qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW)) - return -EPERM; + switch (cmd->qp_type) { + case IB_QPT_RAW_PACKET: + if (!capable(CAP_NET_RAW)) + return -EPERM; + fallthrough; + case IB_QPT_RC: + case IB_QPT_UC: + case IB_QPT_UD: + case IB_QPT_XRC_INI: + case IB_QPT_XRC_TGT: + case IB_QPT_DRIVER: + break; + default: + return -EINVAL; + }; obj = (struct ib_uqp_object *)uobj_alloc(UVERBS_OBJECT_QP, attrs, &ib_dev); -- 2.26.2