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=unavailable 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 84C3DC33CB3 for ; Thu, 16 Jan 2020 17:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53494246A1 for ; Thu, 16 Jan 2020 17:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195997; bh=dnaNne4GSkC2Muvq5tt3Y2IwM3WltMgeSzV1DPWsPyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XjaH68NLtMVmoiwstU683CgWFSpsrHUyp9JB8tX1N++dCAMNoNmxIys8/nz2NNROU 58tKcWgYKPHhCui+lred7oY72cS3ti7FvIsJ4XkZ3iQ8Mt+n2UrpXsxPw8dyvF/+Ji L2RcOKzg1fqplWESaw7x2QvP4TSxEnd75omi2tqY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404603AbgAPRaj (ORCPT ); Thu, 16 Jan 2020 12:30:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:43244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404595AbgAPRah (ORCPT ); Thu, 16 Jan 2020 12:30:37 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4983424713; Thu, 16 Jan 2020 17:30:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195837; bh=dnaNne4GSkC2Muvq5tt3Y2IwM3WltMgeSzV1DPWsPyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2AdEGaycO9zflI/JBer8zuCGcfng3tC4WBHuiOmnqXyeZ04CwPzw4i3iKcU/iXR// O0bC+k2BY1gHfMpyhXaXGhFpM8Nf3aDE3mh/9ktQU0qTKxs15KQJLDFSB4fbfSdSlO 0lDHhkgppM1ibToQRtW5E9QsZFDv+V25jmex9DVk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Leon Romanovsky , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 341/371] RDMA/mlx5: Return proper error value Date: Thu, 16 Jan 2020 12:23:33 -0500 Message-Id: <20200116172403.18149-284-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 [ Upstream commit 546d30099ed204792083f043cd7e016de86016a3 ] Returned value from mlx5_mr_cache_alloc() is checked to be error or real pointer. Return proper error code instead of NULL which is not checked later. Fixes: 81713d3788d2 ("IB/mlx5: Add implicit MR support") Link: https://lore.kernel.org/r/20191029055721.7192-1-leon@kernel.org Signed-off-by: Leon Romanovsky Reviewed-by: Jason Gunthorpe Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mlx5/mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index cfddca850cb4..fb45bfa4f845 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -460,7 +460,7 @@ struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev, int entry) if (entry < 0 || entry >= MAX_MR_CACHE_ENTRIES) { mlx5_ib_err(dev, "cache entry %d is out of range\n", entry); - return NULL; + return ERR_PTR(-EINVAL); } ent = &cache->ent[entry]; -- 2.20.1