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,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 CE809C3B186 for ; Wed, 12 Feb 2020 07:27:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 990A7206DB for ; Wed, 12 Feb 2020 07:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581492436; bh=WTOuxnAf69VZB6PWBFesvFHXvANz8qD+i2VaJTkqnOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2uCu9omgaY+zWZi777NgUquWbtiJguqGtrkdSPOqgrnx74ZhaRQjlW3morfgSrTct 7egKfyVeV4ERCepULbRc4MG6K/JeD4xSogdN4auDP/pFjcu3I+/kTok9q6rUsP/2AC bwJxIzYSckQG9pmfL9YHMqTiUxOhq0ErOK6rR6RA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728325AbgBLH1Q (ORCPT ); Wed, 12 Feb 2020 02:27:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:60072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728237AbgBLH1P (ORCPT ); Wed, 12 Feb 2020 02:27:15 -0500 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 47E552073C; Wed, 12 Feb 2020 07:27:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581492435; bh=WTOuxnAf69VZB6PWBFesvFHXvANz8qD+i2VaJTkqnOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XJ8Kq33n6B8/PwPy+t9D9lrORLGqMq4TiEKntGn93uc7pOizbczAijDEouEGZiWpN 0s15b+2B7cvfD/gTvc2QuvQNKhl0HwzbZBr9DdVt0TNuqRerdZ7VyIVmlw1OYzUq5z QYeIVpBKkMaP9ZVAaZosZIHHGJkvxlmVSPm1yWI4= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Daniel Jurgens , Erez Shitrit , Jason Gunthorpe , Maor Gottlieb , Michael Guralnik , Moni Shoua , Parav Pandit , Sean Hefty , Valentine Fatiev , Yishai Hadas , Yonatan Cohen , Zhu Yanjun Subject: [PATCH rdma-rc 9/9] RDMA/mlx5: Prevent overflow in mmap offset calculations Date: Wed, 12 Feb 2020 09:26:35 +0200 Message-Id: <20200212072635.682689-10-leon@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200212072635.682689-1-leon@kernel.org> References: <20200212072635.682689-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 cmd and index variables declared as u16 and the result is supposed to be stored in u64. The C arithmetic rules doesn't promote "(index >> 8) << 16" to be u64 and leaves the end result to be u16. Fixes: 7be76bef320b ("IB/mlx5: Introduce VAR object and its alloc/destroy methods") Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index e874d688d040..987bfdcd12a5 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2283,8 +2283,8 @@ static int mlx5_ib_mmap_offset(struct mlx5_ib_dev *dev, static u64 mlx5_entry_to_mmap_offset(struct mlx5_user_mmap_entry *entry) { - u16 cmd = entry->rdma_entry.start_pgoff >> 16; - u16 index = entry->rdma_entry.start_pgoff & 0xFFFF; + u64 cmd = (entry->rdma_entry.start_pgoff >> 16) & 0xFFFF; + u64 index = entry->rdma_entry.start_pgoff & 0xFFFF; return (((index >> 8) << 16) | (cmd << MLX5_IB_MMAP_CMD_SHIFT) | (index & 0xFF)) << PAGE_SHIFT; -- 2.24.1