Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp6137811iob; Tue, 10 May 2022 11:10:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxwd69AtuYf+nLthZ61LbpUkaoEjVwkoSmfUv6I9HZ21ieIQZ2avGEXPmtUkdHHtkJjGun X-Received: by 2002:a17:90a:db45:b0:1d9:29d0:4c6e with SMTP id u5-20020a17090adb4500b001d929d04c6emr1162267pjx.46.1652206225351; Tue, 10 May 2022 11:10:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652206225; cv=none; d=google.com; s=arc-20160816; b=gOf/GyBpGffQ/JsbYZ+Iyh4S5SdSwEaTzY98Hj+dvBrHRU/XrRIVIB7PGlBzBEVb5v P8SGgQm3kytdV1ZPfAU8AfJ42zUC2WtedaRQoN8s7Q8Y5idWC20xc6HgfkJ5edg1p4Qr KNQBI9d8Tby8QmPb8TjdlUlShwsGEBI+VD7eqexwa4C+pnQs0N4xFNxjRzrDlfP8/zXe +zX5+YZn/TajVydXW/LsxDEWxyN54bkycUEuk8ysak+K5Wr+B9ZsImEH6T7w+zISBK6V PIaytaQfZQ9YwuVn69aD5XeMMM/HiTVxP7Frx0CeeuhCAyRZDA00oZ9CoDTSp/0smJPt ny8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9o7k0crKUT92LcPas67Xl15Hm2kpx564KXikKHDQBs8=; b=PmSCVUd3N1JRExYjU7Z7Yx8z//zrYOs9JXQS+glPljFoalND0k+L144Zvj/SIolYLO thnhBe1Ho1pzdQFFQboRW9e1sdXGtQQFJkYpnwCCrm5a6KG5zzPYIJrkp8LQZ/8GW5+o kY8ThGQMl/1ihbIdPBYRNqo8hLKoxKbkFEaewQNDms+4AbMaDfxhAwY0QjK2gTxl/KC+ 4XgONtkVAl+r2BQB+BLMZdcnl/RVp6VCflnkYEHuV568uQoTQh4d3WamkUhAXT9Enari v6soO7KjgNoh1QIeL/K8wus30tItS9TfOyW8e+SObsIfT4Sb0dNu4ktJXMi8S7vmKUhk XgOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DHWLK4VH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a056a00194b00b0050a9599eedfsi18933882pfk.343.2022.05.10.11.10.08; Tue, 10 May 2022 11:10:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DHWLK4VH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245727AbiEJN6n (ORCPT + 99 others); Tue, 10 May 2022 09:58:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245197AbiEJNii (ORCPT ); Tue, 10 May 2022 09:38:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB1BDDECC; Tue, 10 May 2022 06:28:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5595360B12; Tue, 10 May 2022 13:28:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54B9AC385C2; Tue, 10 May 2022 13:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1652189319; bh=QjF3jReUNDcYQveU7Tauj4YfmC8J+BQBTJfIbX5n0ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DHWLK4VHiahUEYTMKMDtsGQkA6i0R4uQr1rL477vsqXf+HUkYi7CyCbnRxpN5iqUn 3hp9oMhvOvTWqtE13j9AWO2bgyBYHyL/e6qiPLqFsajKwIzxjXVIZ7UBPfB12HtG3y Ondz4tQe8wMC7CNfGdSf45OM2oJzohPtlosg0OWY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harry Wentland , Alex Deucher Subject: [PATCH 5.15 013/135] drm/amd/display: Avoid reading audio pattern past AUDIO_CHANNELS_COUNT Date: Tue, 10 May 2022 15:06:35 +0200 Message-Id: <20220510130740.778835335@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220510130740.392653815@linuxfoundation.org> References: <20220510130740.392653815@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Harry Wentland commit 3dfe85fa87b2a26bdbd292b66653bba065cf9941 upstream. A faulty receiver might report an erroneous channel count. We should guard against reading beyond AUDIO_CHANNELS_COUNT as that would overflow the dpcd_pattern_period array. Signed-off-by: Harry Wentland Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -3118,7 +3118,7 @@ static void dp_test_get_audio_test_data( &dpcd_pattern_type.value, sizeof(dpcd_pattern_type)); - channel_count = dpcd_test_mode.bits.channel_count + 1; + channel_count = min(dpcd_test_mode.bits.channel_count + 1, AUDIO_CHANNELS_COUNT); // read pattern periods for requested channels when sawTooth pattern is requested if (dpcd_pattern_type.value == AUDIO_TEST_PATTERN_SAWTOOTH ||