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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F15C4C433FE for ; Fri, 15 Oct 2021 07:25:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C29D361040 for ; Fri, 15 Oct 2021 07:25:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C29D361040 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1753A6ECDE; Fri, 15 Oct 2021 07:25:54 +0000 (UTC) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 78F416ECDE for ; Fri, 15 Oct 2021 07:25:52 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B964D2196A; Fri, 15 Oct 2021 07:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1634282750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FEUUj27ulbDb32bD7R86ZKoDCUryGDfUhfzXbUX6ovM=; b=QilGaD0R+0+dE64k3ABlWIr9a24y6W2so8eZl6ljaof+ASJKMEH5xpc+I9VmFkvr0Gw0KN XV//wkgndh+cDg5vtuSsvxf49pkjiVRSqkp1WV+qTy6ZhVnE7sVeGFkIQpNzfIcJ8DC24T NaeSGqmXbUJC+ZpWdoWrQQi/9i5RF6E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1634282750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FEUUj27ulbDb32bD7R86ZKoDCUryGDfUhfzXbUX6ovM=; b=nBFknW5JJEDEfV2ixMSQlUQI3eRMPPPQmjD0p5G7PHdNfg9KZ+TsK8kmyFrCPijcsdDcqJ PxfWTn53Obh3jyCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8B9A613B52; Fri, 15 Oct 2021 07:25:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Z+rsIP4saWFHagAAMHmgww (envelope-from ); Fri, 15 Oct 2021 07:25:50 +0000 From: Thomas Zimmermann To: airlied@redhat.com, daniel@ffwll.ch, ainux.wang@gmail.com Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann , Chuck Lever III , Kim Phillips Subject: [PATCH] Revert "drm/ast: Zero is missing in detect function" Date: Fri, 15 Oct 2021 09:25:46 +0200 Message-Id: <20211015072546.3705-1-tzimmermann@suse.de> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" Commit 572994bf18ff ("drm/ast: Zero is missing in detect function") prevents some systems from booting. Seen on Supermicro Super Server/X10SRL-F, BIOS 3.3 10/28/2020 . There's further a bug that results in KASAN: use-after-free in enqueue_timer+0x4f/0x1e0 which is also triggered by commit 572994bf18ff ("drm/ast: Zero is missing in detect function"). Signed-off-by: Thomas Zimmermann Fixes: 572994bf18ff ("drm/ast: Zero is missing in detect function") Reported-by: Chuck Lever III Reported-by: Kim Phillips Cc: Ainux.Wang Cc: Thomas Zimmermann Cc: Dave Airlie Cc: dri-devel@lists.freedesktop.org Link: https://lore.kernel.org/dri-devel/A194B6CE-AF77-422D-A92F-292ABD83BCCE@oracle.com/ --- drivers/gpu/drm/ast/ast_mode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 6bfaefa01818..ea64944ad4ca 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1306,7 +1306,7 @@ static enum drm_connector_status ast_connector_detect(struct drm_connector int r; r = ast_get_modes(connector); - if (r <= 0) + if (r < 0) return connector_status_disconnected; return connector_status_connected; -- 2.33.0