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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 C9D4DC433FE for ; Mon, 7 Dec 2020 13:41:44 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 655E9233EA for ; Mon, 7 Dec 2020 13:41:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 655E9233EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Cb2+w8HS/uXDuHLgaEFvsn9xD3qYyestNLhfNydIdpQ=; b=nlJ87bIijGDbRyQH9RktnXRwL I/YsCOfHG9c1j+xcYVivxVFAhuI7NTxd7CmPxRy6+XvZldv/5/7lmF+Mo6XNfuCJ4A4yPStcWmeLG I1V0TOqHzd80nVviUe99eZViwFBvShxsB2NcGe/dHi2r0E7qyu9+AcKrdHNmb6gkgIDUi6+obJgAq 068TuSW1RErO6NL7uhaIsSe6kCwoWo2gL2cCAi1OrS+39i3c0ovDRQWH6ziS1NxX/yAyz76G7ydfY N2MrxibJHXAYgguuw6LX5rwMhHQUP5+c/6uclKSg/UJcMx/m/iLEmJa2WCzZ4OEGDx893a+UCEU8N pWg5rjkPA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmGkS-0001Ek-DJ; Mon, 07 Dec 2020 13:40:16 +0000 Received: from new3-smtp.messagingengine.com ([66.111.4.229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmGk7-00017h-5y; Mon, 07 Dec 2020 13:39:56 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id F0D0158035B; Mon, 7 Dec 2020 08:39:54 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 07 Dec 2020 08:39:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=PYgC4c51zzJxa 4Wstz5qKN/jzr2euBwfGyxAuWyGIzY=; b=GkJmWtSgKaCqSTkecRCG2TA1VSkcx C3qwFWCjK/3dygH7dv8QrsD592mXL1zkteIK6pgDotgu5r/9dONaWi5/IhzvI8+E elb1YAnaAvf94K5B9e55rZDWj9goE2nom9DQAcGKBioCZO06U1PArZJhw2UxCCwk PIAZe6PiBjKQi2te6FH/QRMfDOUmU77Pne0JEdr5yIkKJ2/I8nuqOZ767xxisfxL UUE5GC5X+Ex08bZJaGtNI1bUiG91jH8DlNt3wYE5IhERF7iDGbRj0scYKk1iElH6 6ejPJTAMA06pdpFla+G0gpdN8LQgKkcarVbI6QT4ZHNy97yBCi3lDnQfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=PYgC4c51zzJxa4Wstz5qKN/jzr2euBwfGyxAuWyGIzY=; b=XIUl5aBs RJ9t+GqtgL7ipkUieFCB5e2tETgv6FvG7Brtv9WbNE0x15adwBw5E/Sn1CiKcIVU rWisAYEyVkh1sPRFYtmCwJZ8+AaIIAWlJ1jDBo1jM9ZaVEfQF8SX1GCoQsaQ8kHH 4yjyHV+tgWV5CV2q19XDkCJ3Xdcntr1tOfEi8IVfxl1yqCzz/R2Flj/f2FS+sXIL Xd7U3J2tUcCm05G9Isx7TIixGaEu8NSvlxjLdyIwzWOAo+byT/UGCaA2gmUIMGxL JiKlFhJGN7A9SqbHIf5oU8TRgDzBr6P8peJdUxnjk5g8z7zHtanp5FH3Vbjq359h BzU9OvglQIFCFw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejgedgheehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id 8A8EA1080063; Mon, 7 Dec 2020 08:39:54 -0500 (EST) From: Maxime Ripard To: Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Daniel Vetter , David Airlie , Eric Anholt Subject: [PATCH v4 3/8] drm/vc4: hdmi: Don't access the connector state in reset if kmalloc fails Date: Mon, 7 Dec 2020 14:39:43 +0100 Message-Id: <20201207133948.2109194-4-maxime@cerno.tech> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201207133948.2109194-1-maxime@cerno.tech> References: <20201207133948.2109194-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201207_083955_297123_9EAD1EA8 X-CRM114-Status: GOOD ( 12.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Dave Stevenson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org drm_atomic_helper_connector_reset uses kmalloc which, from an API standpoint, can fail, and thus setting connector->state to NULL. However, our reset hook then calls drm_atomic_helper_connector_tv_reset that will access connector->state without checking if it's a valid pointer or not. Make sure we don't end up accessing a NULL pointer. Suggested-by: Dave Stevenson Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 5a608ed1d75e..112c09873eb4 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -171,7 +171,9 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) static void vc4_hdmi_connector_reset(struct drm_connector *connector) { drm_atomic_helper_connector_reset(connector); - drm_atomic_helper_connector_tv_reset(connector); + + if (connector->state) + drm_atomic_helper_connector_tv_reset(connector); } static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel