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=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 221C6C76188 for ; Fri, 19 Jul 2019 04:19:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4C3421849 for ; Fri, 19 Jul 2019 04:19:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509961; bh=hYKMYDhiCUOLwuJCCV2T6WZ95tVpSrU+qbjqRPZJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bt9xRu2UIGCIyRAdSbeEiyBg1Xv0cn/q/iwhiFU6Wl5USUMoYVBJh6AcDozeA8hZ9 BgA4tFerVjFAKLCwdOmHHpMRGej0EMX/oVkbsrLaHA07JmHO+zk0WRK6L9tMpG0kGW SLfGwChYlyhc7YcWeQ8wYdxmHBOiE1jZzpEIagto= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388325AbfGSENP (ORCPT ); Fri, 19 Jul 2019 00:13:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:49036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389100AbfGSENP (ORCPT ); Fri, 19 Jul 2019 00:13:15 -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 EF47321850; Fri, 19 Jul 2019 04:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509594; bh=hYKMYDhiCUOLwuJCCV2T6WZ95tVpSrU+qbjqRPZJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=le+gVLLnvVhhxzhGPcFM4KhAAkdZe5M/k8MaqvUkowiJNU5WOVEe5MmtT/tbzXzkD NBtQDfdjHF8avNVkSclstgWzS2apiT+u9MiUfg5ZUPzXcux7izCes23hrhTv3jjcq3 pu2Hkvfsgx4vrJa/RR2BMlUisy9wk7CjX8BNsfYg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gen Zhang , Jani Nikula , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 06/45] drm/edid: Fix a missing-check bug in drm_load_edid_firmware() Date: Fri, 19 Jul 2019 00:12:25 -0400 Message-Id: <20190719041304.18849-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719041304.18849-1-sashal@kernel.org> References: <20190719041304.18849-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gen Zhang [ Upstream commit 9f1f1a2dab38d4ce87a13565cf4dc1b73bef3a5f ] In drm_load_edid_firmware(), fwstr is allocated by kstrdup(). And fwstr is dereferenced in the following codes. However, memory allocation functions such as kstrdup() may fail and returns NULL. Dereferencing this null pointer may cause the kernel go wrong. Thus we should check this kstrdup() operation. Further, if kstrdup() returns NULL, we should return ERR_PTR(-ENOMEM) to the caller site. Signed-off-by: Gen Zhang Reviewed-by: Jani Nikula Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20190524023222.GA5302@zhanggen-UX430UQ Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_edid_load.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 622f788bff46..aa0e8c704c33 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -275,6 +275,8 @@ int drm_load_edid_firmware(struct drm_connector *connector) * the last one found one as a fallback. */ fwstr = kstrdup(edid_firmware, GFP_KERNEL); + if (!fwstr) + return ERR_PTR(-ENOMEM); edidstr = fwstr; while ((edidname = strsep(&edidstr, ","))) { -- 2.20.1