Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ed57ca49-f80e-9bf5-4dc3-59fb62ca4315@intel.com>
Date:   Fri, 6 May 2022 15:07:32 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.8.1
Subject: Re: [PATCH v3 3/4] fbdev: efifb: Cleanup fb_info in .fb_destroy
 rather than .remove
Content-Language: en-US
To:     Javier Martinez Canillas <javierm@redhat.com>,
        <linux-kernel@vger.kernel.org>
CC:     <linux-fbdev@vger.kernel.org>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Helge Deller <deller@gmx.de>,
        <dri-devel@lists.freedesktop.org>, Peter Jones <pjones@redhat.com>,
        Thomas Zimmermann <tzimmermann@suse.de>
References: <20220505215947.364694-1-javierm@redhat.com>
 <20220505220540.366218-1-javierm@redhat.com>
From:   Andrzej Hajda <andrzej.hajda@intel.com>
Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298
 Gdansk - KRS 101882 - NIP 957-07-52-316
In-Reply-To: <20220505220540.366218-1-javierm@redhat.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NUdvQ0k5TUpPUjRmbEFlU0dJYmFkdFZYRWFPS2pXSE5ySTJ1MjFDSkpucTZB?=
 =?utf-8?B?VUx0TXFtVEE4VjlRYnJEV21GWlRlVFEzeFA0TjN1WSs0TTJiblo5UXc3akxs?=
 =?utf-8?B?SW0ydU9vU3UvV3VUR0V1eXc0YmwvRE5sbjVqOXBtU3VkYkx0SnVDSUErQWE3?=
 =?utf-8?B?R0FuOFhMRFA3cU5BeFFOS3JKWDA2MVdaR2dlU0lZdE44Z1l4clZlR0J4a1VB?=
 =?utf-8?B?ZjIvSDJubXoxeUx0MzhiS0s0SzZmUHpOTGJuSDhLejNwZnpVVkZhbkhYdXZo?=
 =?utf-8?B?eWppRFBkT2dESnpiV1YyV1g2NlJsZnJtNW5VY0FTNVB6c2pZRDRUMHhEaFhD?=
 =?utf-8?B?dFVtNjRFR283QmFMVFVLNnluSm5TRlpuTkNhK2V0alh0TEdTcno3eDMxV1li?=
 =?utf-8?B?eXpHR3ByODhNTXlxTkNJb0VKdlpJS0Z5U1lQQ3I0YmxBRUlNZHdCWGtZaWYw?=
 =?utf-8?B?eVFxWmt6WVUxZUE4bWdZUHNwTHpiZGY0aHQzOHNJQmcyZW53YW9rdVJOY3kv?=
 =?utf-8?B?ZXJPSnFMRjdxc2R4RVUxak0yclROcWQzOXA4cTJNRTZTVEJiV0RVNkZzbkdZ?=
 =?utf-8?B?ajdsSmcxZ0hqV3dJbFdtV2RWUXdpcmpnRjJVaEVDZlRXamdzOStka3pQKzU2?=
 =?utf-8?B?Uzl5OW5rK2pwTHhsT0FuTFEyT3hCU2RoTE05c2kwS0l3TmpoUHQ2aFdJNTNW?=
 =?utf-8?B?RmlMVDJlbFFDNDNERkd6TVlMdmMyMjRLaEt6QXFjQWFnZTREaU03ckdHQU8w?=
 =?utf-8?B?bWZ4WmF0a2dHRVJCdEpFOWpweFVLYmhsejlia0s5QnA2bHNadE1NcG9BVndv?=
 =?utf-8?B?K25PSGNzaHhqVFhJVjNZVnB3bDlqSW9Pb0U5TzhMbDhUZjFCK2hQMjFWckdk?=
 =?utf-8?B?cFo2MUNjSWVud2kzL3EvTG94WGpHK1JYVE1UWjBGRkRmQ2R3VFBnVnh5bVds?=
 =?utf-8?B?QjZpeEh4V2tsYjMzRnpsUlRpYUE4NWR3RmlUS2pBcFd5ckh3Nk9BRkNlRDlx?=
 =?utf-8?B?dXJTZGd3anlDMGw3T3h2ejRaam9sd2pNV2pyMjNVTUZXSkVmOC9IWVB5NDMx?=
 =?utf-8?B?cExiamxaUXBWa0dTNVk1eXBiTGV4VmJOYUU0TldHVjZJUXBsYUc0VW9YT2VV?=
 =?utf-8?B?RXlDbjZvaWcwdXRLamdiTDZiUmFBaXN1ME42L2FlLzY4MlZuOWNGdk96K2dU?=
 =?utf-8?B?TDZLSmlnMXRycDRNbkdEKzF3M1o0eGs1Q2oxd1JRZXNhVUMxTTFhYnFrNWR4?=
 =?utf-8?B?b0w2dFhKcm1kajdJMzNoNWp0UjZlMmM3Z2ZGeDNBT3VFYkt3MzJhY3pWbjU2?=
 =?utf-8?B?SEpvdG5SUUZUKy9zRmZ6T3FXNjZKZWRlaU1MRVh5WmtUZU1pK015OEdGUnBq?=
 =?utf-8?B?M2Y5RHdvVWxadk9hYUliMlJwd0hyOERKU3ZrZldBaG5tNWNncktpUkdiTXNE?=
 =?utf-8?B?azB2a3Y4M3FuN09XQnl1UmR3Mm80NmpST1E3QVhjUGJhOG16MmtFMFpWWnZa?=
 =?utf-8?B?SGp4OGdFY0VaN25udWQvL2t6UXRBWE1SampneDNMb1VVSFpBeEZIUWtPOHBq?=
 =?utf-8?B?LzJ4NHA0TlQvOGRKd2FyVVdxUjNCZFZINXM3MjhYTEowUklJbnE4WlUvOEhH?=
 =?utf-8?B?bE1pMWFacklLenBFSVduUTdWTGJOTGs4TmMvVnFvK0FRVDV1MXh4c0FCMWNK?=
 =?utf-8?B?SXFBWWtWSlRVaHZoSk9RbWZpZnlpY1BjSkcxb3lOU2JWaDJUbXJNckJ2c0ZU?=
 =?utf-8?B?QWIwNGwxcFVudStYNFpFSURZejE1clRmVlEyTEVxMjljUUwveGhrZmtQakpj?=
 =?utf-8?B?M1pJaHRKcFZ4MzAycUx5aUZZM2ZaaVdiQkN6ZUJsTVpQSU9jWW9hT1l2WlU5?=
 =?utf-8?B?U0lvL0ZGWmsrYzBrakUwWG5qVWNmeHFBcjh4ZFlQWXVGSHR5bnZDdTl0Ulpl?=
 =?utf-8?B?QkRxbnZKUy95c3NvV1RIWkFWMCsvQ2haeG95eTFLd0ROb2x4dmZyaWU1bURs?=
 =?utf-8?B?VWZRL0w2amdIZlpibUd1eHFsNk1zeEJ2ZWFQU1VMcEZWaGxibWFOREN3WUZR?=
 =?utf-8?B?OEdvdXAvWGZSTnp6REZmaGFVZXRzbXBjRWREeEtkNm0wcjZ5eWFEdElVMkh3?=
 =?utf-8?B?VXF4dGwybDMzSVVnZDU5K0hLTjZlTVVLTnZRR25tc0ZYRXJ1Q1lNa1M1bm1u?=
 =?utf-8?B?WjJvcHhqUkdwekJvcU9JVVo0WXVZOHpzSWhTL3RVNm1wbzFmbVR4T3J6Q0Jo?=
 =?utf-8?B?dWpFYWhNSzkxdlFIY05ra0lCSWlyeUljTVhxVXV2bCtWeHdXWlpEN1VpZmFu?=
 =?utf-8?B?NG1UQjdCRm4wYU1DYVJRZ2tFdmdwNklnUXZrZ0lxWDhmdlQ2dEZWS3RaK0Ns?=
 =?utf-8?Q?7lz7tQoh3CTetKDs=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f43635a7-2443-426a-0917-08da2f616538
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3180.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2022 13:07:38.5819
 (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: rb/3C3xykl+vvHl4XyNRPvU6yByqm4Cg/DFf4m+MB/3ZUwecAge7OR9SRiIrK5mr5HNA+UZoLBJXiOw2+cArNw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2767
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 06.05.2022 00:05, Javier Martinez Canillas wrote:
> The driver is calling framebuffer_release() in its .remove callback, but
> this will cause the struct fb_info to be freed too early. Since it could
> be that a reference is still hold to it if user-space opened the fbdev.
> 
> This would lead to a use-after-free error if the framebuffer device was
> unregistered but later a user-space process tries to close the fbdev fd.
> 
> To prevent this, move the framebuffer_release() call to fb_ops.fb_destroy
> instead of doing it in the driver's .remove callback.
> 
> Strictly speaking, the code flow in the driver is still wrong because all
> the hardware cleanupd (i.e: iounmap) should be done in .remove while the
> software cleanup (i.e: releasing the framebuffer) should be done in the
> .fb_destroy handler. But this at least makes to match the behavior before
> commit 27599aacbaef ("fbdev: Hot-unplug firmware fb devices on forced removal").
> 
> Fixes: 27599aacbaef ("fbdev: Hot-unplug firmware fb devices on forced removal")
> Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 
> (no changes since v1)
> 
>   drivers/video/fbdev/efifb.c | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
> index ea42ba6445b2..cfa3dc0b4eee 100644
> --- a/drivers/video/fbdev/efifb.c
> +++ b/drivers/video/fbdev/efifb.c
> @@ -243,6 +243,10 @@ static void efifb_show_boot_graphics(struct fb_info *info)
>   static inline void efifb_show_boot_graphics(struct fb_info *info) {}
>   #endif
>   
> +/*
> + * fb_ops.fb_destroy is called by the last put_fb_info() call at the end
> + * of unregister_framebuffer() or fb_release(). Do any cleanup here.
> + */
>   static void efifb_destroy(struct fb_info *info)
>   {
>   	if (efifb_pci_dev)
> @@ -254,6 +258,9 @@ static void efifb_destroy(struct fb_info *info)
>   		else
>   			memunmap(info->screen_base);
>   	}
> +
> +	framebuffer_release(info);
> +
>   	if (request_mem_succeeded)
>   		release_mem_region(info->apertures->ranges[0].base,
>   				   info->apertures->ranges[0].size);

You are releasing info, then you are using it.

I suspect it is responsible for multiple failures of Intel CI [1].

[1]: 
http://gfx-ci.fi.intel.com/tree/drm-tip/CI_DRM_11615/fi-adl-ddr5/boot0.txt

Regards
Andrzej


> @@ -620,9 +627,9 @@ static int efifb_remove(struct platform_device *pdev)
>   {
>   	struct fb_info *info = platform_get_drvdata(pdev);
>   
> +	/* efifb_destroy takes care of info cleanup */
>   	unregister_framebuffer(info);
>   	sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
> -	framebuffer_release(info);
>   
>   	return 0;
>   }