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 58BD7C3F68F for ; Thu, 16 Jan 2020 18:53:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2AD44206D7 for ; Thu, 16 Jan 2020 18:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579200787; bh=dbN6Hk/xeS7pJGBNgUEA1kBcGzbGki87brQhHo3UQPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jGMTzfP79k2MVLMBPDxff1j5H3Y1jTb4yJ0VBY0h3DH7WlN5QHJZ442Nnd1hh/yCZ Hz28IO2volXw9T2Z6h3vfCRNbbpN4yaXtC7/D9hl9mbYkiv7GQo14Tx+sNTje49kvD 1KEQZ/AafrmCq2RrSrAc/QTb2w2yVLI99qVZkxtQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389378AbgAPRIT (ORCPT ); Thu, 16 Jan 2020 12:08:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:41484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389339AbgAPRIO (ORCPT ); Thu, 16 Jan 2020 12:08:14 -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 DD6FA21D56; Thu, 16 Jan 2020 17:08:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194493; bh=dbN6Hk/xeS7pJGBNgUEA1kBcGzbGki87brQhHo3UQPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wkqPqmICKur3HiNo/1Y02Nb21pnAemKhRTIgSOHeTrCF4xNyQFHuh7frexjdPZRVq KoYtbW5sMxXr2CSgpa6SsQJdb8ZLAJ62Ct6w4i/9VpI7K3jEJ6haAq89sX2GgDw5Ys yKZxp4YQklwD63DJPjBTMGpGeXnjsaolanaIZZOs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 391/671] RDMA/uverbs: check for allocation failure in uapi_add_elm() Date: Thu, 16 Jan 2020 12:00:29 -0500 Message-Id: <20200116170509.12787-128-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-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: Dan Carpenter [ Upstream commit cac2a301c02a9b178842e22df34217da7854e588 ] If the kzalloc() fails then we should return ERR_PTR(-ENOMEM). In the current code it's possible that the kzalloc() fails and the radix_tree_insert() inserts the NULL pointer successfully and we return the NULL "elm" pointer to the caller. That results in a NULL pointer dereference. Fixes: 9ed3e5f44772 ("IB/uverbs: Build the specs into a radix tree at runtime") Signed-off-by: Dan Carpenter Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/uverbs_uapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/infiniband/core/uverbs_uapi.c b/drivers/infiniband/core/uverbs_uapi.c index be854628a7c6..959a3418a192 100644 --- a/drivers/infiniband/core/uverbs_uapi.c +++ b/drivers/infiniband/core/uverbs_uapi.c @@ -17,6 +17,8 @@ static void *uapi_add_elm(struct uverbs_api *uapi, u32 key, size_t alloc_size) return ERR_PTR(-EOVERFLOW); elm = kzalloc(alloc_size, GFP_KERNEL); + if (!elm) + return ERR_PTR(-ENOMEM); rc = radix_tree_insert(&uapi->radix, key, elm); if (rc) { kfree(elm); -- 2.20.1