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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 E779FC2D0DB for ; Fri, 24 Jan 2020 11:23:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFE1321556 for ; Fri, 24 Jan 2020 11:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864991; bh=f6MM8M30IvlGsLr55QwmbZJmg2tFGoH8lL+QaUmuUC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N66nX+cNiiwRrG0aDqONNyl3GPR2ClkNzSifFKSqX3/mQpiefHp3rDwjPC99Z5KSI Ft0bE3KrwKVF20CRY90+CpImIfUOV+o0fPPVQDDw+M7vFls1lXpM43lCgVhDyotuIu WeaL0bwXSZACawUSqTXlXNW610H9RsR9bT4iC0zc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390605AbgAXLXL (ORCPT ); Fri, 24 Jan 2020 06:23:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:35130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391272AbgAXLXA (ORCPT ); Fri, 24 Jan 2020 06:23:00 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 1E31D2077C; Fri, 24 Jan 2020 11:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864979; bh=f6MM8M30IvlGsLr55QwmbZJmg2tFGoH8lL+QaUmuUC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fjZ+x4eonWnJ4N8TOKWbExE52Yl+42ZX7IhisBW4JlbTA2wC4D+fOO+gZMkh5fqeK TYdRXkkVmdboxP+AwwORQ74C8+1nLBpowZco5cWhagLNVNy7Di6lTCxI20xpx4gwSD u7RDHCmmvyz8WsFQHRE9CTPmIg6MfhJR6ZKLZ7J0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.19 406/639] RDMA/uverbs: check for allocation failure in uapi_add_elm() Date: Fri, 24 Jan 2020 10:29:36 +0100 Message-Id: <20200124093137.930604331@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 be854628a7c63..959a3418a192d 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