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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D1B6DD3E79C for ; Thu, 11 Dec 2025 07:46:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54B1E10E733; Thu, 11 Dec 2025 07:46:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="piQxLRjX"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="YqD+2s/U"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="I+aaB9XR"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="lKpE2VfE"; dkim-atps=neutral Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC54A10E071 for ; Thu, 11 Dec 2025 07:46:30 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1CCFB5BEB2; Thu, 11 Dec 2025 07:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1765439188; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=iyhD2EQfYeErloUm6CQL23MGTpBFfxOTtRgajhl+lhU=; b=piQxLRjXjQZg/sTYOdTsCRLr3wCzJTweaYrOdm1bRm7Rp002EPdXhnjQoERYUUB3YfgusR vFtbZKJLxrmyOqwDRXISvbNuYUspYHbt3EqRarsV1ts9n7M6uWhmYPWm3x8VzIdiB060cO R5jAZcSbczH4241126InzN2kRyrQrb8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1765439188; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=iyhD2EQfYeErloUm6CQL23MGTpBFfxOTtRgajhl+lhU=; b=YqD+2s/UnsiZH+peU7bjr8z4lLOXwu9d5OQjNX+AuCxED4bDdVbb4bxKvfDxCiYcpEy/U0 ut3CpGGysUe6iAAg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=I+aaB9XR; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=lKpE2VfE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1765439187; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=iyhD2EQfYeErloUm6CQL23MGTpBFfxOTtRgajhl+lhU=; b=I+aaB9XRqZV+ueU7OBvkdRON2UWVeGgHes3n1PMpdxTAAThh7+Gy2PCTiEeMJZNdwfIiHq cV+awrY7NPadQb1UxUQxBebP7oYzj6A9aCIpBzGfyKqpMtEwGeeQA8Ksk5N5eu2r7gKY1Q ze26R6SrNLGd7OsyexuzbRK38EdRqf4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1765439187; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=iyhD2EQfYeErloUm6CQL23MGTpBFfxOTtRgajhl+lhU=; b=lKpE2VfE3fnrNuHNiYaiEDSBGShNpKMiSCDQS8mHU/YM+PzMAhlfhVaaO23ExEgfjgaHes i6LKd4gEG7jJ06Bg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B6BF33EA63; Thu, 11 Dec 2025 07:46:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id DkohK9J2OmnSHgAAD6G6ig (envelope-from ); Thu, 11 Dec 2025 07:46:26 +0000 Message-ID: Date: Thu, 11 Dec 2025 08:46:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RESEND 2/3] drm/atomic: add max_size check to drm_property_replace_blob_from_id() To: Dmitry Baryshkov , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org References: <20251210-drm-fix-lut-checks-v1-0-10ae38519f43@oss.qualcomm.com> <20251210-drm-fix-lut-checks-v1-2-10ae38519f43@oss.qualcomm.com> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: <20251210-drm-fix-lut-checks-v1-2-10ae38519f43@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FREEMAIL_TO(0.00)[oss.qualcomm.com,linux.intel.com,kernel.org,gmail.com,ffwll.ch,amd.com,igalia.com]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_TWELVE(0.00)[13]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,qualcomm.com:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:url]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 1CCFB5BEB2 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Hi Am 10.12.25 um 20:42 schrieb Dmitry Baryshkov: > The function drm_property_replace_blob_from_id() allows checking whether > the blob size is equal to a predefined value. In case of variable-size > properties (like the gamma / degamma LUTs) we might want to check for > the blob size against the maximum, allowing properties of the size > lesser than the max supported by the hardware. Extend the function in > order to support such checks. > > Signed-off-by: Dmitry Baryshkov > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5 +++++ > drivers/gpu/drm/drm_atomic_uapi.c | 7 +++++-- > drivers/gpu/drm/drm_property.c | 11 +++++++++++ > include/drm/drm_property.h | 1 + > 4 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > index e027798ece03..d19631b5d9e1 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > @@ -1677,6 +1677,7 @@ dm_atomic_plane_set_property(struct drm_plane *plane, > &dm_plane_state->degamma_lut, > val, -1, > sizeof(struct drm_color_lut), > + 0, The rest of the API uses -1 for an invalid/unknown argument. I'd stick with that instead of using 0. > &replaced); > dm_plane_state->base.color_mgmt_changed |= replaced; > return ret; > @@ -1695,6 +1696,7 @@ dm_atomic_plane_set_property(struct drm_plane *plane, > &dm_plane_state->ctm, > val, > sizeof(struct drm_color_ctm_3x4), -1, > + 0, > &replaced); > dm_plane_state->base.color_mgmt_changed |= replaced; > return ret; > @@ -1703,6 +1705,7 @@ dm_atomic_plane_set_property(struct drm_plane *plane, > &dm_plane_state->shaper_lut, > val, -1, > sizeof(struct drm_color_lut), > + 0, > &replaced); > dm_plane_state->base.color_mgmt_changed |= replaced; > return ret; > @@ -1716,6 +1719,7 @@ dm_atomic_plane_set_property(struct drm_plane *plane, > &dm_plane_state->lut3d, > val, -1, > sizeof(struct drm_color_lut), > + 0, > &replaced); > dm_plane_state->base.color_mgmt_changed |= replaced; > return ret; > @@ -1724,6 +1728,7 @@ dm_atomic_plane_set_property(struct drm_plane *plane, > &dm_plane_state->blend_lut, > val, -1, > sizeof(struct drm_color_lut), > + 0, > &replaced); > dm_plane_state->base.color_mgmt_changed |= replaced; > return ret; > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c > index 85dbdaa4a2e2..7d2076f1006e 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -388,6 +388,7 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, > &state->degamma_lut, > val, > -1, sizeof(struct drm_color_lut), > + 0, > &replaced); > state->color_mgmt_changed |= replaced; > return ret; > @@ -395,7 +396,7 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, > ret = drm_property_replace_blob_from_id(dev, > &state->ctm, > val, > - sizeof(struct drm_color_ctm), -1, > + sizeof(struct drm_color_ctm), -1, 0, > &replaced); > state->color_mgmt_changed |= replaced; > return ret; > @@ -404,6 +405,7 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, > &state->gamma_lut, > val, > -1, sizeof(struct drm_color_lut), > + 0, > &replaced); > state->color_mgmt_changed |= replaced; > return ret; > @@ -546,6 +548,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, > val, > -1, > sizeof(struct drm_mode_rect), > + 0, > &replaced); > return ret; > } else if (property == plane->scaling_filter_property) { > @@ -741,7 +744,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, > ret = drm_property_replace_blob_from_id(dev, > &state->hdr_output_metadata, > val, > - sizeof(struct hdr_output_metadata), -1, > + sizeof(struct hdr_output_metadata), -1, 0, > &replaced); > return ret; > } else if (property == config->aspect_ratio_property) { > diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c > index 596272149a35..5befe443135d 100644 > --- a/drivers/gpu/drm/drm_property.c > +++ b/drivers/gpu/drm/drm_property.c > @@ -759,6 +759,7 @@ EXPORT_SYMBOL(drm_property_replace_blob); > * @blob_id: the id of the new blob to replace with > * @expected_size: expected size of the blob property > * @expected_elem_size: expected size of an element in the blob property > + * @max_size: the maximum size of the blob property for variable-size blobs > * @replaced: if the blob was in fact replaced > * > * Look up the new blob from id, take its reference, check expected sizes of > @@ -773,6 +774,7 @@ int drm_property_replace_blob_from_id(struct drm_device *dev, > uint64_t blob_id, > ssize_t expected_size, > ssize_t expected_elem_size, > + ssize_t max_size, I'd put max_size before expected_size, so that the size of individual elements isn't located in the middle of them. > bool *replaced) > { > struct drm_property_blob *new_blob = NULL; > @@ -801,6 +803,15 @@ int drm_property_replace_blob_from_id(struct drm_device *dev, > drm_property_blob_put(new_blob); > return -EINVAL; > } > + > + if (max_size > 0 && > + new_blob->length > max_size) { > + drm_dbg_atomic(dev, > + "[BLOB:%d] length %zu greater than max %zu\n", > + new_blob->base.id, new_blob->length, max_size); > + drm_property_blob_put(new_blob); > + return -EINVAL; > + } I'd first test for max_size before testing for expected size. And shouldn't you also test for (max_size % expected_elem_size == 0)? Best regards Thomas > } > > *replaced |= drm_property_replace_blob(blob, new_blob); > diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h > index 082f29156b3e..aa49b5a42bb5 100644 > --- a/include/drm/drm_property.h > +++ b/include/drm/drm_property.h > @@ -284,6 +284,7 @@ int drm_property_replace_blob_from_id(struct drm_device *dev, > uint64_t blob_id, > ssize_t expected_size, > ssize_t expected_elem_size, > + ssize_t max_size, > bool *replaced); > int drm_property_replace_global_blob(struct drm_device *dev, > struct drm_property_blob **replace, > -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)