From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C6A8136E0E; Tue, 23 Apr 2024 11:40:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713872426; cv=none; b=dkwp/GAwWQb8cYal/eu7tyVIz7uRnOss1ql5UXdOLELW7k9sZtBjv2/ZxfCt7joV8DiVdmJGEgL0eivFLhR4gVYfF6nzMd1sssHiMnV48uzuYhUsJWB/Mn/MfDMqqswkeQAauOZ8Ew44djSQX9aXHd+CFk1OCIWEGLQbpSNy1iQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713872426; c=relaxed/simple; bh=j7L54d9WUWPSsPM8HcAhEmP8NtCCzciLBHdJr/eBWGE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JXkYkJVlKrBie9h6SbhLF8I5o2chFhbbGC8oNZo7vdRQZNESIRbZfwwquf94MuHxAYITn4BEp0u1jclD3YYv+fInNca9B/ELRc9uTFEnjK02ENaCrudhmrdjzYUErrSgDfPAWmDav7xE7VotlIoUa9lfmV+7uiEWqu/WQdAjqAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EU4AIK/O; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EU4AIK/O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1F7FC116B1; Tue, 23 Apr 2024 11:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713872426; bh=j7L54d9WUWPSsPM8HcAhEmP8NtCCzciLBHdJr/eBWGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EU4AIK/O+ohldd2vZZ6C2S05M5YdUvaRMVlnF1mVseyhfq1kCu8lEFYeYb/DhKDwG ivJon5hiZPXnRJNg7qvVuI8ezQlZ66AHyIdXAPWYGSIirFfMzqocj1Fl+jCHHVDR8r /BXHQfaUK/okTmmU5YbDj5c2y/5tsdRLGSOBf6vIn+0a86OLA9rgAFjUWkKDt9hItE fkg2qn/RH0u6+8ZLRzRRPapjKUoaqZWiqJ2P6ztRpuI1DETleOCHwCLmHBaAhsNl0t pjBT03ii/gW5giUgsiJclcWPnDok0bA3OUvV/lYihyMh3hhox60tGzYQrcVPe1HVk+ c6HMGVZu8MdWA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Kees Cook , Jeff Johnson , =?UTF-8?q?Christian=20K=C3=B6nig?= , Sasha Levin , Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-hardening@vger.kernel.org Subject: [PATCH AUTOSEL 6.8 16/18] drm/radeon: silence UBSAN warning (v3) Date: Tue, 23 Apr 2024 07:01:12 -0400 Message-ID: <20240423110118.1652940-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240423110118.1652940-1-sashal@kernel.org> References: <20240423110118.1652940-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.8.7 Content-Transfer-Encoding: 8bit From: Alex Deucher [ Upstream commit 781d41fed19caf900c8405064676813dc9921d32 ] Convert a variable sized array from [1] to []. v2: fix up a few more. v3: integrate comments from Kees. Reviewed-by: Kees Cook Tested-by: Jeff Johnson (v2) Acked-by: Christian König (v1) Signed-off-by: Alex Deucher Cc: keescook@chromium.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/pptable.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/pptable.h b/drivers/gpu/drm/radeon/pptable.h index 94947229888ba..b7f22597ee95e 100644 --- a/drivers/gpu/drm/radeon/pptable.h +++ b/drivers/gpu/drm/radeon/pptable.h @@ -424,7 +424,7 @@ typedef struct _ATOM_PPLIB_SUMO_CLOCK_INFO{ typedef struct _ATOM_PPLIB_STATE_V2 { //number of valid dpm levels in this state; Driver uses it to calculate the whole - //size of the state: sizeof(ATOM_PPLIB_STATE_V2) + (ucNumDPMLevels - 1) * sizeof(UCHAR) + //size of the state: struct_size(ATOM_PPLIB_STATE_V2, clockInfoIndex, ucNumDPMLevels) UCHAR ucNumDPMLevels; //a index to the array of nonClockInfos @@ -432,14 +432,14 @@ typedef struct _ATOM_PPLIB_STATE_V2 /** * Driver will read the first ucNumDPMLevels in this array */ - UCHAR clockInfoIndex[1]; + UCHAR clockInfoIndex[] __counted_by(ucNumDPMLevels); } ATOM_PPLIB_STATE_V2; typedef struct _StateArray{ //how many states we have UCHAR ucNumEntries; - ATOM_PPLIB_STATE_V2 states[1]; + ATOM_PPLIB_STATE_V2 states[] __counted_by(ucNumEntries); }StateArray; @@ -450,7 +450,7 @@ typedef struct _ClockInfoArray{ //sizeof(ATOM_PPLIB_CLOCK_INFO) UCHAR ucEntrySize; - UCHAR clockInfo[1]; + UCHAR clockInfo[] __counted_by(ucNumEntries); }ClockInfoArray; typedef struct _NonClockInfoArray{ @@ -460,7 +460,7 @@ typedef struct _NonClockInfoArray{ //sizeof(ATOM_PPLIB_NONCLOCK_INFO) UCHAR ucEntrySize; - ATOM_PPLIB_NONCLOCK_INFO nonClockInfo[1]; + ATOM_PPLIB_NONCLOCK_INFO nonClockInfo[] __counted_by(ucNumEntries); }NonClockInfoArray; typedef struct _ATOM_PPLIB_Clock_Voltage_Dependency_Record -- 2.43.0