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: 13966347 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 0B741C02198 for ; Sat, 8 Feb 2025 10:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:CC:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=AJ/UCwHAeb5tbc5Bg9IiNtxLf51uZ4AvQVnOe571y1U=; b=slJbK8reMxqAv6PBJ5lroaXUfj +fcU8hyA9gA2Kp+GaimckfCKxqRLJ+AADn/iQW9x6lEi19cOua7KdVxA3a0ORaJs0yemef1DCC4w5 Pe86tTpqVbBHMAVY5CXPbhib27WV304Y/Fi4IrFACIOqUq+EJIPe5lTA6E9AsY0a/Yh9t2/sI7xWT 9zxopN2ByRudpfDfEsf/BQEhogC+oBiLezBMOqJht3NCzdESxq1+FKRoJj4JlXpnx/xLv5+MlAECF As6tNL/Sk50HDTZIfosxulIjVnln9/GFmbFffeD6AWHiFA4819lYLXk0OBvOXHJYY9V8APo6OSmDA ead7Z1FA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tghi9-0000000ChXa-1F2O; Sat, 08 Feb 2025 10:05:17 +0000 Received: from ssh247.corpemail.net ([210.51.61.247]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tghgj-0000000ChJo-2gVe for linux-arm-kernel@lists.infradead.org; Sat, 08 Feb 2025 10:03:51 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250208_020350_038601_A037D8DF X-CRM114-Status: UNSURE ( 7.18 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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");