From patchwork Fri Jan 24 09:28:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233221 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=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 B133FC2D0DB for ; Fri, 24 Jan 2020 09:51:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8294F21734 for ; Fri, 24 Jan 2020 09:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859467; bh=hHQnTI/fZocNtpaKKw3mSDU3iQ/BXJSK2ON7LgSsyo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cC35uav7T3DLIJ/JEit2g5mtTrnhjnc6CgW4mMYLI4X1rKFfLcCyOGZbwbDgFjr77 Vp3y1TE9CRKAkJmZzL6SFcfxKfDHGt9imjJE7UqIiDYkqJ6a1txB3+lzuFnIl3Ypfj HgWl5lZxp9fY/rfeZ1i1bbVXwZZTmm/mGPiewMuw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387866AbgAXJvG (ORCPT ); Fri, 24 Jan 2020 04:51:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:52152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730738AbgAXJvG (ORCPT ); Fri, 24 Jan 2020 04:51:06 -0500 Received: from localhost (unknown [145.15.244.15]) (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 5475321556; Fri, 24 Jan 2020 09:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859465; bh=hHQnTI/fZocNtpaKKw3mSDU3iQ/BXJSK2ON7LgSsyo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kl7shB5Z5ZxbJ4k2GD4eGMQrOOPTT5xwYFcl0qkniIRx6voNyCzrpUAC+m10lajhK 77rABdzSYXMXQQmkJ7mF7ARgdtUVdmDL+czxpPXdw4G0FK3AViQeyYkqKxjXFtGu0+ dkOJmxNYiT4SbJppqIcdPGAyJ/uTF05kDBK7uiSI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Christian Gmeiner , Lucas Stach , Sasha Levin Subject: [PATCH 4.14 099/343] drm/etnaviv: potential NULL dereference Date: Fri, 24 Jan 2020 10:28:37 +0100 Message-Id: <20200124092933.079661717@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter [ Upstream commit 9e05352340d3a3e68c144136db9810b26ebb88c3 ] The etnaviv_gem_prime_get_sg_table() is supposed to return error pointers. Otherwise it can lead to a NULL dereference when it's called from drm_gem_map_dma_buf(). Fixes: 5f4a4a73f437 ("drm/etnaviv: fix gem_prime_get_sg_table to return new SG table") Signed-off-by: Dan Carpenter Reviewed-by: Christian Gmeiner Signed-off-by: Lucas Stach Signed-off-by: Sasha Levin --- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c index ae884723e9b1b..880b95511b987 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c @@ -26,7 +26,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj) int npages = obj->size >> PAGE_SHIFT; if (WARN_ON(!etnaviv_obj->pages)) /* should have already pinned! */ - return NULL; + return ERR_PTR(-EINVAL); return drm_prime_pages_to_sg(etnaviv_obj->pages, npages); }