Received-SPF: pass (google.com: domain of linux-kernel+bounces-162651-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 29 Apr 2024 09:05:55 -0700
From: Ira Weiny <ira.weiny@intel.com>
To: Li Zhijian <lizhijian@fujitsu.com>, <dave@stgolabs.net>,
	<jonathan.cameron@huawei.com>, <dave.jiang@intel.com>,
	<alison.schofield@intel.com>, <vishal.l.verma@intel.com>,
	<ira.weiny@intel.com>, <dan.j.williams@intel.com>,
	<linux-cxl@vger.kernel.org>
CC: <linux-kernel@vger.kernel.org>, Li Zhijian <lizhijian@fujitsu.com>
Subject: Re: [PATCH 1/2] cxl/region: Fix potential invalid pointer dereference
Message-ID: <662fc563c6bb2_19ca3929485@iweiny-mobl.notmuch>
References: <20240429013154.368118-1-lizhijian@fujitsu.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240429013154.368118-1-lizhijian@fujitsu.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Hh66XJQJwUsMwubIdKTVXKSSbhn9hBjpJjyQcosBahEdAhat8vukyZsmsrv/?=
 =?us-ascii?Q?t6cJtuz439IyXCqQho9eP7u5UG3lH14L7nNz64wVq/CCPQCakL86n+cl+CkD?=
 =?us-ascii?Q?dw8QDUgZCNp+FPD4Y95vh1SCyCTOnMeAS9MqhD4YiHbsWDLG3K+0v+JVynfJ?=
 =?us-ascii?Q?yRPemgvRNarxGK6jNBYvVHvv8k8MDNuAiTr8gzkujJRrARoKZWPVIpLNZfE1?=
 =?us-ascii?Q?07X+fjwqQBiVrnLVNtjD6sjh/QJj1r9C9bzDTkCFyIxIDG68GUYDXO/1DIyn?=
 =?us-ascii?Q?wmrixGb1cJBOc0buaUGi5pgMg8PoZAR8xeaeGII04rgjPkc4+PaYzbYBc/nw?=
 =?us-ascii?Q?PjhCEMrEmDHP/OpR0KPfJAGN6+7q+P0qfqgRw1aPV7oZfWznUbwZw0p1zG+K?=
 =?us-ascii?Q?nLtdySoHw2/NR3lWDPdojuHE7psrTekVJLmBDkkpTv+45hyuIBoROZciP+0u?=
 =?us-ascii?Q?kX8cde9Nh3AwYjLg3evwKRNcbQCXJXspYs0X+kVTzl5DMUKFr5YQZqzeDjMR?=
 =?us-ascii?Q?IPp8LlovOu+1YoAhQ9Svy82hpNhbsY+3iOlmqNlVkNgFLBG1qMOEWSMTaGC0?=
 =?us-ascii?Q?bxZ5eGfkAATuOqM8H4zZyJMuTa7OWFgFybWeC8vAmHviXzdNmT/8yulrI7vc?=
 =?us-ascii?Q?rvHm1ImvNlgpx3qM/zz/YUsNXTaS6HZsM345milQEkkHfyojPVh4anmnyJLk?=
 =?us-ascii?Q?AA6QWPpMYSVqZBZ+RiyD6o7OaGhuFOCIF/ftLhLNdK5nd7/FElsNwZV7fB3s?=
 =?us-ascii?Q?ng4YCGJm0nIjXDw1rkfNeB/MnaHaLJ+iD1XzAti9rKMgmAqRjyz6OgAyPNSU?=
 =?us-ascii?Q?kL2akjCYMds7GaHkuE8hKZ2+szKI1q8RVelcA6RJOGhetMCb/gZxIHSzBuES?=
 =?us-ascii?Q?6ayroFEB8IChWeOMO6bGNQQ891I/qMxbJZ/lU3y8yeStgXZuDsd7nFzfwzaB?=
 =?us-ascii?Q?wz1FbA9vnpQNkKZxOUxlPvwaQp3x7vR84lUHVctqN5FNW2uo+ZztSB8VQHDB?=
 =?us-ascii?Q?HNH+FZe3voOQ8V223JXooK+NhqC1iOypf19Lp6C9L3mnWxuuOlJ1VZ1Rvhdf?=
 =?us-ascii?Q?aWc6PU5B4vTVD/1PfTna7N0ahtLeA/uhkoqKAqbur26YFO78DRK0HSpfJsMt?=
 =?us-ascii?Q?9e/diXrRWOzRFxaGh3Csj1qL/0iW7IKjT/1/bz1C6qrpsADL4JMDCVO90c2Z?=
 =?us-ascii?Q?9tJDQB6D5SdMfSLQAU4A136GETRHrX4KsjvFEtQbfdelqAn488TBPWVc+IFg?=
 =?us-ascii?Q?VT1E4fAHNmUfGKYB0z2Y08ZBHBInHKFrV0ZDlCBhwLzE41PWMFtEulvH0r2R?=
 =?us-ascii?Q?EP0BXIUXNY/RNLd5678C2pC2mfO7nGNY+5NKqjD+OTWxPQnXnte+mwTaJN1g?=
 =?us-ascii?Q?M2JwYr+M6rfKUTLGW1IyjAC7G0bI4r8JzfKT537UdBvMCIK2VH4/85m3MkTm?=
 =?us-ascii?Q?h+Ij3OyWhkhqfUYqMZzO7zcUU3ycZAsYlGVU1Od4+2cWUfh1sHcQLDmM4Igb?=
 =?us-ascii?Q?ZNn3xkD8c9Jhco6IdMDeQxCWM1tqnYizmOtu4iIOFV2X9HTexMCL9BquE9nM?=
 =?us-ascii?Q?bh7x482kKDfgKhWmJ1YytW/NaLLSXEvlByxGGljF?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ec9ba319-2662-4dab-d3fc-08dc6866432b
X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB6733.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 16:06:00.4705
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: nbLu/BrhApfKMTgB6svLJPhH4ZZebLMgbOXwh0UN6z8Q3qYNtQW0Nc7IYGwWnOH/vw0dE8JGCevQJ/lVZR5//g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6712
X-OriginatorOrg: intel.com

Li Zhijian wrote:
> construct_region() could return a PTR_ERR() which cannot be derefernced.
                                                             ^^^^
                                                             dereferenced

> Moving the dereference behind the error checking to make sure the
> pointer is valid.
> 

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> Fixes: a32320b71f08 ("cxl/region: Add region autodiscovery")
> Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
> ---
>  drivers/cxl/core/region.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
> index 8535718a20f0..3c80aa263a65 100644
> --- a/drivers/cxl/core/region.c
> +++ b/drivers/cxl/core/region.c
> @@ -3086,10 +3086,9 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled)
>  	mutex_lock(&cxlrd->range_lock);
>  	region_dev = device_find_child(&cxlrd->cxlsd.cxld.dev, hpa,
>  				       match_region_by_range);
> -	if (!region_dev) {
> +	if (!region_dev)
>  		cxlr = construct_region(cxlrd, cxled);
> -		region_dev = &cxlr->dev;
> -	} else
> +	else
>  		cxlr = to_cxl_region(region_dev);
>  	mutex_unlock(&cxlrd->range_lock);
>  
> @@ -3097,6 +3096,9 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled)
>  	if (rc)
>  		goto out;
>  
> +	if (!region_dev)
> +		region_dev = &cxlr->dev;
> +
>  	attach_target(cxlr, cxled, -1, TASK_UNINTERRUPTIBLE);
>  
>  	down_read(&cxl_region_rwsem);
> -- 
> 2.29.2
>