From nobody Sun Feb 8 05:37:05 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4858E1AE0B9 for ; Thu, 4 Jul 2024 13:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720100955; cv=none; b=aBH9LhqTiexy9CYV7iWw2S8U/896qqc7T5pIzUm7xQb3OrDH/7V0FCzAdS3k4OfukPluQzV+zPX9T5UgTujvOVo1uiSe5W5076OnCa4FEOo1bBlXY0PGj39sLcSHHgG4g8DpFqSNjsCl9ZBrH0uhZQor6DBIZeflKa/pn4GbN0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720100955; c=relaxed/simple; bh=SVHBjvqF3IQcPJm5lbSEaNgBOLV96gStzFaXadJ84G4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Poa3/4WV+KTd5bku55ZDuq85ByYG44Vlv85fujwF+CCVZ/Oxj3Air116odhzPApLICGI4Fq8oG2+eZURqY8rv+s54GzgqAvgPNl28waMA5mdiL/QrmvEt5JF7+YZu8Ke01C0trJHIihzFICd6Yh1PUas7xYupKjaQKXHa72NGiQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from icess-ProLiant-DL380-Gen10.. (unknown [183.174.60.14]) by APP-01 (Coremail) with SMTP id qwCowADXt0xCqIZmHxGPAQ--.6565S2; Thu, 04 Jul 2024 21:48:58 +0800 (CST) From: Ma Ke To: alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, airlied@linux.ie Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH RESEND] drm/radeon: fix null pointer dereference in radeon_add_common_modes Date: Thu, 4 Jul 2024 21:48:49 +0800 Message-Id: <20240704134849.302898-1-make24@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qwCowADXt0xCqIZmHxGPAQ--.6565S2 X-Coremail-Antispam: 1UD129KBjvdXoWruryxAF1kZF1xGr4fKF18uFg_yoWDXrX_CF 10qa9rXas0vasYvF17u3ZxZr9I93y0va1ktF1xtayfZ34xXF1fuFy3tFy0vw47Xay5AFnx J34rK3WfArWxGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb38FF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6r1S6rWUM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Jr0_ Gr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s 1lnxkEFVAIw20F6cxK64vIFxWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IE w4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMc vjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v 4I1lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7 v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF 1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIx AIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI 42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWI evJa73UjIFyTuYvjfUOlksUUUUU X-CM-SenderInfo: ppdnvj2u6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" In radeon_add_common_modes(), the return value of drm_cvt_mode() is assigned to mode, which will lead to a possible NULL pointer dereference on failure of drm_cvt_mode(). Add a check to avoid npd. Fixes: d50ba256b5f1 ("drm/kms: start adding command line interface using fb= .") Signed-off-by: Ma Ke --- drivers/gpu/drm/radeon/radeon_connectors.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/r= adeon/radeon_connectors.c index b84b58926106..71ddc4672850 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -520,6 +520,8 @@ static void radeon_add_common_modes(struct drm_encoder = *encoder, struct drm_conn continue; =20 mode =3D drm_cvt_mode(dev, common_modes[i].w, common_modes[i].h, 60, fal= se, false, false); + if (!mode) + continue; drm_mode_probed_add(connector, mode); } } --=20 2.25.1