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=-10.1 required=3.0 tests=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 1DD5DC10F27 for ; Tue, 10 Mar 2020 09:14:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF46A2467F for ; Tue, 10 Mar 2020 09:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583831691; bh=or3mMeHU0VxFlTf55SEF3D2iz5kaIcvsxi/phGBy4AM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v6QPLiIgdthIB/SD4vRojpnbW8qkZJNn4SrUG1XPQTxOPEpPUZdqQXSu/iDM74/Do SjBIbYdZ/xhR1EXP/P+GWzNIN/SWmGws+8cbbfHa9pwbD/HUIuWtv7Ul/pJKoP33Jx RBRB+oKyRH9XPJnkjEvds23ca1jaVehJyGIF65d8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726480AbgCJJOu (ORCPT ); Tue, 10 Mar 2020 05:14:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:45024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726195AbgCJJOu (ORCPT ); Tue, 10 Mar 2020 05:14:50 -0400 Received: from localhost (unknown [193.47.165.251]) (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 F283F20674; Tue, 10 Mar 2020 09:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583831689; bh=or3mMeHU0VxFlTf55SEF3D2iz5kaIcvsxi/phGBy4AM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iGZ1u75DrvPHIh2Yf3xhH4RTowJx19DTjga0b/PgpZe9ThK6JoyleMsJDfmu9/G/U KModobpymYGvKd59Mf2WQFf0A7URgsA+2KjyYBwotqGqSGZ6/6uRGX1UctpczT5hN7 iwLSqu1+zSJKC63omqDYCUeagct9tuceaFwFxj68= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , Gal Pressman , linux-rdma@vger.kernel.org Subject: [PATCH rdma-next v1 03/11] RDMA/efa: Use in-kernel offsetofend() to check field availability Date: Tue, 10 Mar 2020 11:14:30 +0200 Message-Id: <20200310091438.248429-4-leon@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310091438.248429-1-leon@kernel.org> References: <20200310091438.248429-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 Remove custom and duplicated variant of offsetofend(). Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/efa/efa_verbs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c index bf3120f140f7..5c57098a4aee 100644 --- a/drivers/infiniband/hw/efa/efa_verbs.c +++ b/drivers/infiniband/hw/efa/efa_verbs.c @@ -144,9 +144,6 @@ static inline bool is_rdma_read_cap(struct efa_dev *dev) return dev->dev_attr.device_caps & EFA_ADMIN_FEATURE_DEVICE_ATTR_DESC_RDMA_READ_MASK; } -#define field_avail(x, fld, sz) (offsetof(typeof(x), fld) + \ - sizeof_field(typeof(x), fld) <= (sz)) - #define is_reserved_cleared(reserved) \ !memchr_inv(reserved, 0, sizeof(reserved)) @@ -609,7 +606,7 @@ struct ib_qp *efa_create_qp(struct ib_pd *ibpd, if (err) goto err_out; - if (!field_avail(cmd, driver_qp_type, udata->inlen)) { + if (offsetofend(typeof(cmd), driver_qp_type) > udata->inlen) { ibdev_dbg(&dev->ibdev, "Incompatible ABI params, no input udata\n"); err = -EINVAL; @@ -896,7 +893,7 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, goto err_out; } - if (!field_avail(cmd, num_sub_cqs, udata->inlen)) { + if (offsetofend(typeof(cmd), num_sub_cqs) > udata->inlen) { ibdev_dbg(ibdev, "Incompatible ABI params, no input udata\n"); err = -EINVAL; -- 2.24.1