From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1795276041; b=RYtlSbSckAb0g+k98gRnfWELGF5jsC5qZwP9ZfHFgt0Ml4z7cUvRnyuIRmtRWpHWcD0a +3YDPi22o7MGqz5aTiNtd1RsmbVLEamAkaFBNSePnSxhUdDLFZF9j2J4ogmupUn30vaDE NY2BW2M7jM3f+oPAYT2ywpl2grabXG4eQTnXWgHiqy10t+8k+q3ERCOHpVjp9DYFQYEa7 HtM6olQceoEsksq+qNPoJCLsWR67ik6AJhlDP5Svn9++IyjXvA3ORAcLxzwruXrZv22NO CWqYTa6fp2zMFV+YdLeSXBRecTo4Cx7zHAMt/ETNHc2c/DNSr8HhVhopppMYQ69wkdg== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795276041; h=Received:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id:References: In-Reply-To:To:Cc:X-Mailer:X-Developer-Signature:X-Developer-Key: X-Endpoint-Received:X-Original-From:Reply-To; bh=HBSWhLpR35zo6U9WT1n8EOKDBlN1p/otYxjn8MP/fRQ=; b=d4Vs/HCEcZGYy+RdFeJMb9gf9Il+IrYWQIWpGzXqmK9e3mt13fm0kj1nWXSUxa9M8I68 uo7qETh3lyrY3W76swJ1zYGCPZalCIj3bmM6gCy9vaZv3GzKUABBSgNTWED5Mf5LcKY9/ GRMULsPjzoTcWqd6SSKfpUY+L7W6Su0Nf6/LEnhr5xX+f8Jwtn6sRN5DmecrktjMX8Ttq QmPOOJFEcb/RqsvJq/GEIvuB7Ri1QwN+riaBwwIWenLCq4GRmSkuGpyLGohuuRDOKc2d6 vee6Uv1jakPAmlyCq0PbnMJFJx2csRsd6XkK3PWyxUFH8TA9xEM72JBNHYs7ALH44Zg== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Gpxg33ha; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93CDF606A332 for ; Sat, 21 Nov 2026 15:47:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Gpxg33ha Authentication-Results: smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 ARC-Seal: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; cv=none; t=1795276041; b=SEtpyNy82YZA3jONWZH9AOnWosOTBKYDhZHUlIlGR4bcCqDh+Kyr0RCFFy4CxsMuAPxG I3sGQbXo/Oe8QqfEOyvxMSwy1P2nplHKBggTHV4Mg05J+cjEtGxYWWkQtkjqf1gjkEe6S 6CC6i8+PniN22rm2J6fQ4GLSPW97fl/6WX4fx2o9sxRoIhvFI9Qeeh/Dk2eHFnERYBHAG tt8dDnKY7A8x3nFO5gSZHM9wgWCvOH60E+uR+OdBuNDxsWrFikOGp1dQBWV4i0gEw1A+q OtMI8DcBepfrj69behnJazk4dsSkaVqg3h8l1z9sd4REgvWjH+vI196vSvBPnNjSChA== ARC-Message-Signature: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; c=relaxed/relaxed; t=1795276041; h=DKIM-Signature:Received:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key:X-Endpoint-Received: X-Original-From:Reply-To; bh=HBSWhLpR35zo6U9WT1n8EOKDBlN1p/otYxjn8MP/fRQ=; b=TjwS5QkmDDaWI4lEHjIRjjs56esojNtXgycXcvuVSqnWSrDFS4JgEhLePJdokvr76kTG dTRGT7HlF07TqulwKMmrzo3eYH1MIC+KjlR+UXe6Wa3Aa+Sll0BEp1ni1UMOMo+1LwltP eEi/7ywH91qSeogH3DqgCpHIbOzOlQAMIj9RvvZ2B/0qhkaeAxiuC2Bs104rHH6H2TPBO JuojyzJnNd2EUG2ATRFy9qZQbodFtsjmHttovwK/892q2+9HRf3GhSHZCjaob1e4ZxlNG c4WBoZyhYhGJzp/R0ujBnl4bREXbVPNPEofKrHx3mwMIM5qsSShynFtHou9qw8Erj7A== ARC-Authentication-Results: i=1; smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 Received: from lkml.kernel.org (nexus.subspace.kernel.org [100.80.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 341F81F000C0; Sat, 21 Nov 2026 15:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795276041; bh=HBSWhLpR35zo6U9WT1n8EOKDBlN1p/otYxjn8MP/fRQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To; b=Gpxg33ha+v9iHGRDw6xSauoDB76NnuOPvsdksrFz4xgApTvYISu7qRpboEIe7dJRf MBuwkgQhlUrdw/PFmHGNqyB9eek4sr8Tb1jhc6jq7Qwj9c1Z5KJP5apQFTslDj1awZ rfc7btW74JNBMe4xgXJfBv5MkJfSuGcmZOZARiD9bj/DNwK+G6bY0BDF18YdytzDw/ v1wToL23BM6vW/Eq6oLIwy4sKZMXU/TpKByA3PtbjvCfI0rZ7E6sD2e7Ywjh1srfje F6zJr+B9IKfAYgBAfAyxOoCjGC0rBQLlMaKj1LtpSE2I5oO3mf8Aq3QWnvp1R0xV/E f+fPzNJ456nQA== Received: from nexus.subspace.kernel.org (localhost [IPv6:::1]) by lkml.kernel.org (Postfix) with ESMTP id B78644BCEE; Sat, 21 Nov 2026 15:47:19 +0000 (UTC) From: Suyuan Wang via B4 Relay Date: Sat, 21 Nov 2026 15:47:20 +0000 Subject: [PATCH v2 2/2] drm/imagination: Don't truncate the layer count in max_rts X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261121-pvr-hwrt-common-v2-2-9f53bdf954de@gmail.com> References: <20261121-pvr-hwrt-common-v2-0-9f53bdf954de@gmail.com> In-Reply-To: <20261121-pvr-hwrt-common-v2-0-9f53bdf954de@gmail.com> To: alessio.belle@imgtec.com, luigi.santivetti@imgtec.com Cc: donald.robson@imgtec.com, mripard@kernel.org, dri-devel@lists.freedesktop.org, maarten.lankhorst@linux.intel.com, airlied@gmail.com, simona@ffwll.ch, tzimmermann@suse.de, linux-kernel@vger.kernel.org, imagination@lists.freedesktop.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795276038; l=1689; i=shyckless@gmail.com; s=default; h=from:subject:message-id; bh=o9CYMe+Nds/S6RqTPnGZR4pVb5VMi2qOsqYHSAh9ASQ=; b=PN14VgJ1BlQIAM6U2DDGPcc41e4M99u6xxvK7PdP5tg6I+L4uPQ7E7sFuRL3LGTzVG0sXYRYO GaQLLPkM09JCMD0/KyVPn0DA24dRqlagax3fkHUkAfs9xwScNAyCf6S X-Developer-Key: i=shyckless@gmail.com; a=ed25519; pk=pMtccVGiWES3bV+7YBFuBclkvq2n2HBHQ5azaBrK2lY= X-Endpoint-Received: by B4 Relay for shyckless@gmail.com/default with auth_id=1498 X-Original-From: Suyuan Wang Reply-To: shyckless@gmail.com From: Suyuan Wang hwrt_init_kernel_structure() stores the 32-bit args->layers from userspace in the 16-bit hwrt->max_rts: hwrt->max_rts = args->layers; hwrt_data_init_fw_structure() then allocates the SRTC and RAA objects when args->layers > 1, but hwrt_data_fini_fw_structure() only frees them when hwrt->max_rts > 1. With layers = 0x10000 or 0x10001, max_rts ends up as 0 or 1, so both firmware objects are leaked when the data set is destroyed or its creation fails. Any user who can open the render node can do this with DRM_IOCTL_PVR_CREATE_HWRT_DATASET, and the objects grow with the layer count. Make max_rts a u32, like args->layers and the max_rts field of the firmware's struct rogue_fwif_rta_ctl, so that both checks see the same value. Found with a static analysis tool and checked by hand. Fixes: 6eedddab733b ("drm/imagination: Implement free list and HWRT create and destroy ioctls") Cc: stable@vger.kernel.org Co-developed-by: Kaixuan Li Signed-off-by: Kaixuan Li Signed-off-by: Suyuan Wang --- drivers/gpu/drm/imagination/pvr_hwrt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imagination/pvr_hwrt.h b/drivers/gpu/drm/imagination/pvr_hwrt.h index 676070b20c3b..7c215e2bd35a 100644 --- a/drivers/gpu/drm/imagination/pvr_hwrt.h +++ b/drivers/gpu/drm/imagination/pvr_hwrt.h @@ -74,7 +74,7 @@ struct pvr_hwrt_dataset { struct pvr_free_list *free_lists[ROGUE_FWIF_NUM_RTDATA_FREELISTS]; /** @max_rts: Maximum render targets for this HWRT data set. */ - u16 max_rts; + u32 max_rts; }; struct pvr_hwrt_dataset * -- 2.34.1