From patchwork Sat Feb 8 10:03:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Han X-Patchwork-Id: 13966350 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FBE8C02198 for ; Sat, 8 Feb 2025 10:25:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AABB310E3AB; Sat, 8 Feb 2025 10:25:24 +0000 (UTC) X-Greylist: delayed 913 seconds by postgrey-1.36 at gabe; Sat, 08 Feb 2025 10:25:23 UTC Received: from mail-vip.corpemail.net (mail-vip.corpemail.net [162.243.126.186]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03D2610E3D2 for ; Sat, 8 Feb 2025 10:25:22 +0000 (UTC) Received: from ssh247.corpemail.net by ssh247.corpemail.net ((D)) with ASMTP (SSL) id GEM00027; Sat, 08 Feb 2025 18:03:27 +0800 Received: from jtjnmail201607.home.langchao.com (10.100.2.7) by jtjnmail201621.home.langchao.com (10.100.2.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sat, 8 Feb 2025 18:03:26 +0800 Received: from locahost.localdomain (10.94.15.112) by jtjnmail201607.home.langchao.com (10.100.2.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sat, 8 Feb 2025 18:03:26 +0800 From: Charles Han To: , , , , , , , , CC: , , , Charles Han Subject: [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL check in zynqmp_audio_init Date: Sat, 8 Feb 2025 18:03:22 +0800 Message-ID: <20250208100323.11625-1-hanchunchao@inspur.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Originating-IP: [10.94.15.112] X-ClientProxiedBy: Jtjnmail201618.home.langchao.com (10.100.2.18) To jtjnmail201607.home.langchao.com (10.100.2.7) tUid: 202520818032700b0aa2241bd3ab51cd75d7331f83a16 X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" devm_kasprintf() can return a NULL pointer on failure,but this returned value in zynqmp_audio_init() is not checked. Add NULL check in zynqmp_audio_init(), to handle kernel NULL pointer dereference error. Fixes: 3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support") Signed-off-by: Charles Han Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c index fa5f0ace6084..f07ff4eb3a6d 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c @@ -323,12 +323,16 @@ int zynqmp_audio_init(struct zynqmp_dpsub *dpsub) audio->dai_name = devm_kasprintf(dev, GFP_KERNEL, "%s-dai", dev_name(dev)); + if (!audio->dai_name) + return -ENOMEM; for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { audio->link_names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s-dp-%u", dev_name(dev), i); audio->pcm_names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s-pcm-%u", dev_name(dev), i); + if (!audio->link_names[i] || !audio->pcm_names[i]) + return -ENOMEM; } audio->base = devm_platform_ioremap_resource_byname(pdev, "aud");