From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 17B2A3A1A5C; Mon, 16 Mar 2026 16:44:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773679480; cv=none; b=C5sYqUF+pzqZ6wbqnOXyy/AMVh+MVMA+vPYqLdL/1JjGoMk5HaZjcvYgS+U/Bxy8RQdetEezOqDZfm4Dxze5hhDjNb7F2uFrclnHvcbjAl0CZZP2/ll/bH2RZd5wDaJ5j32UYq1YyCfEVs/fAHNqy2Fxp6DOaoFdeQRJGBBL2dU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773679480; c=relaxed/simple; bh=r3k38bwjH0ZuBrxeJO+jvgnNmMlBitH7QWdnFx3etxo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Tld1LfMllTFjfUZ/zgKtSf4wSH4oEIfsCnDexYxHJ46lb5zXrNQKkVxsG2asjfpkbc6NiIfvhDXSaLqZGNrYVAcydUthQxpicmgjF4BvtbnPumOEsGHOQnH+UrKidRtsnFxDGiRWqKS5nfXxnsaqc+nQlWyb7AxtotgTBigu3Ic= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ZZIYyiYA; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZZIYyiYA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1773679479; x=1805215479; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=r3k38bwjH0ZuBrxeJO+jvgnNmMlBitH7QWdnFx3etxo=; b=ZZIYyiYAIyeDphrK0OlE4qHu0iWOiAZyoJ+k0imay28SKNlG+/Yzt3Jd D3I6B9VD/tMAutcTZKSvDIW/wbv2LNcqFZAOpZSL+Q/qYmYn/k6VTwBsX Tsjj278rdlH37wQe05fZLcqE3ca5hY4mwZQCsyxBKMz0i9WY0L0uW8MIr h9rGDiAQFAxa6i0PGJzGaykplj1oeORzvZRCFzy7Z3I5r2I6xLUkvtFWA X7W0ZJM0dH/mZvlMlf5vcQTI7tyc6H4ZFtsYaDdp/sfB++ZfYWV1zA386 Lurnhak98KvHkMl7lZWZryYi/uBxYckqfLu6UNQ+9mb4lCvjQU9I87QUn w==; X-CSE-ConnectionGUID: jKOX7FfCTWC9g0ozBFrhRQ== X-CSE-MsgGUID: xmbB4wtpRRKC6V16sOymeg== X-IronPort-AV: E=McAfee;i="6800,10657,11731"; a="78596963" X-IronPort-AV: E=Sophos;i="6.23,124,1770624000"; d="scan'208";a="78596963" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2026 09:44:38 -0700 X-CSE-ConnectionGUID: 1c52I7EMQXa0Q4onwQ1fKg== X-CSE-MsgGUID: 0s2F2lCxSLeAGDs+P2W7XQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,124,1770624000"; d="scan'208";a="221920519" Received: from pgcooper-mobl3.ger.corp.intel.com (HELO localhost) ([10.245.245.42]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2026 09:44:35 -0700 Date: Mon, 16 Mar 2026 18:44:32 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Rosen Penev Cc: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Kees Cook , "Gustavo A. R. Silva" , open list , "open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b" Subject: Re: [PATCH] drm: dp_tunnel: use kzalloc_flex Message-ID: References: <20260308211220.33759-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland On Tue, Mar 10, 2026 at 03:09:31PM -0700, Rosen Penev wrote: > On Tue, Mar 10, 2026 at 1:12 AM Ville Syrjälä > wrote: > > > > On Sun, Mar 08, 2026 at 02:12:20PM -0700, Rosen Penev wrote: > > > Simplifies allocation by using a flexible array member to remove a > > > second kzalloc. > > > > > > Added __counted_by for extra runtime analysis. > > > > > > Simplify assignment loop. It always returns true. That is, > > > max_group_count is always equal to group_count. > > > > > > Signed-off-by: Rosen Penev > > > --- > > > drivers/gpu/drm/display/drm_dp_tunnel.c | 26 ++++++------------------- > > > 1 file changed, 6 insertions(+), 20 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/display/drm_dp_tunnel.c b/drivers/gpu/drm/display/drm_dp_tunnel.c > > > index f442430d8de7..aad1605b956e 100644 > > > --- a/drivers/gpu/drm/display/drm_dp_tunnel.c > > > +++ b/drivers/gpu/drm/display/drm_dp_tunnel.c > > > @@ -188,13 +188,13 @@ struct drm_dp_tunnel_group { > > > struct drm_dp_tunnel_mgr { > > > struct drm_device *dev; > > > > > > - int group_count; > > > - struct drm_dp_tunnel_group *groups; > > > wait_queue_head_t bw_req_queue; > > > > > > #ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG > > > struct ref_tracker_dir ref_tracker; > > > #endif > > > + int group_count; > > > + struct drm_dp_tunnel_group groups[] __counted_by(group_count); > > > }; > > > > > > /* > > > @@ -1893,7 +1893,6 @@ static void destroy_mgr(struct drm_dp_tunnel_mgr *mgr) > > > ref_tracker_dir_exit(&mgr->ref_tracker); > > > #endif > > > > > > - kfree(mgr->groups); > > > kfree(mgr); > > > } > > > > > > @@ -1913,33 +1912,20 @@ drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count) > > > struct drm_dp_tunnel_mgr *mgr; > > > int i; > > > > > > - mgr = kzalloc_obj(*mgr); > > > + mgr = kzalloc_flex(*mgr, groups, max_group_count); > > > if (!mgr) > > > return ERR_PTR(-ENOMEM); > > > > > > + mgr->group_count = max_group_count; > > > mgr->dev = dev; > > > init_waitqueue_head(&mgr->bw_req_queue); > > > > > > - mgr->groups = kzalloc_objs(*mgr->groups, max_group_count); > > > - if (!mgr->groups) { > > > - kfree(mgr); > > > - > > > - return ERR_PTR(-ENOMEM); > > > - } > > > - > > > #ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG > > > ref_tracker_dir_init(&mgr->ref_tracker, 16, "drm_dptun"); > > > #endif > > > > > > - for (i = 0; i < max_group_count; i++) { > > > - if (!init_group(mgr, &mgr->groups[i])) { > > > - destroy_mgr(mgr); > > > - > > > - return ERR_PTR(-ENOMEM); > > > - } > > > - > > > - mgr->group_count++; > > > - } > > > + for (i = 0; i < max_group_count; i++) > > > + init_group(mgr, &mgr->groups[i]); > > > > This breaks the error handling. > > > > Hmm, actually it looks like it already got broken by commit > > 8e6da25bd60d ("drm/dp_tunnel: Switch private_obj initialization > > to atomic_create_state")... > I can't comment on that. > > This patch does not touch that. You are removing what remains of the error handling, and that part would have to be undone to fix the earlier breakage. Maxime, can you fix that up? > > > > > > > > return mgr; > > > } > > > -- > > > 2.53.0 > > > > -- > > Ville Syrjälä > > Intel -- Ville Syrjälä Intel