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 9BA3CCA9EA9 for ; Fri, 18 Oct 2019 22:19:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62BC420872 for ; Fri, 18 Oct 2019 22:19:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571437166; bh=m3eqnAyX7YQq/GZ/dsrQcZVOFLqUBgDqsTcp4cZvz+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O1UDZ3Z1BMyTeId38ma+LAS94rubb7JzCxLLjdXOgYuqpRIGwJN+iWkxwS/z5DBK+ ZVAkiXrhSxubY3K5gNXMogn4wDtAU7zwv43kL6iQgczQJ1HoQ34+FZpHF/Ljp6s31I A1GKVu62ffwGsaN3UMrmxe8mi9rD3whdLiaO4xoc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404493AbfJRWTZ (ORCPT ); Fri, 18 Oct 2019 18:19:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:39132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732323AbfJRWHC (ORCPT ); Fri, 18 Oct 2019 18:07:02 -0400 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 4667D205F4; Fri, 18 Oct 2019 22:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436422; bh=m3eqnAyX7YQq/GZ/dsrQcZVOFLqUBgDqsTcp4cZvz+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NMAYkhAvwMIZ+uq+ntEAM81MT8Ex5yPcly4mJkbVvvrnkilabSNeqxXys1T13tWrN 71FeK1vQCwrumtRkh9O2NAa2IiWGK2fdTHB1Yt5gpN1E1fep1Y6LbEYPHIrmGJmnrL 01lOBvBkk8guiLjJOpOfdBLDJb0MrNYueLMlqbmc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Dennis Dalessandro , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 064/100] RDMA/hfi1: Prevent memory leak in sdma_init Date: Fri, 18 Oct 2019 18:04:49 -0400 Message-Id: <20191018220525.9042-64-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220525.9042-1-sashal@kernel.org> References: <20191018220525.9042-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit 34b3be18a04ecdc610aae4c48e5d1b799d8689f6 ] In sdma_init if rhashtable_init fails the allocated memory for tmp_sdma_rht should be released. Fixes: 5a52a7acf7e2 ("IB/hfi1: NULL pointer dereference when freeing rhashtable") Link: https://lore.kernel.org/r/20190925144543.10141-1-navid.emamdoost@gmail.com Signed-off-by: Navid Emamdoost Acked-by: Dennis Dalessandro Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hfi1/sdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c index d648a4167832c..64ab92f8a4a28 100644 --- a/drivers/infiniband/hw/hfi1/sdma.c +++ b/drivers/infiniband/hw/hfi1/sdma.c @@ -1518,8 +1518,11 @@ int sdma_init(struct hfi1_devdata *dd, u8 port) } ret = rhashtable_init(tmp_sdma_rht, &sdma_rht_params); - if (ret < 0) + if (ret < 0) { + kfree(tmp_sdma_rht); goto bail; + } + dd->sdma_rht = tmp_sdma_rht; dd_dev_info(dd, "SDMA num_sdma: %u\n", dd->num_sdma); -- 2.20.1