[PATCH weston v2] desktop-shell: drop shell_client from the head of the surface list on destroy

[Pekka Paalanen]

On Fri, 29 May 2015 10:46:44 -0500
Derek Foreman <derekf at osg.samsung.com> wrote:

> This prevents a use after free when the surfaces are automatically cleaned
> up later, as shell_client's freed node was still in the surface list.
> 
> Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> ---
>  desktop-shell/shell.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
> index fe620cb..66e47a3 100644
> --- a/desktop-shell/shell.c
> +++ b/desktop-shell/shell.c
> @@ -5822,6 +5822,13 @@ handle_shell_client_destroy(struct wl_listener *listener, void *data)
>  
>  	if (sc->ping_timer)
>  		wl_event_source_remove(sc->ping_timer);
> +
> +	/* Since we're about to free shell_client, we remove it from the
> +	 * head of the surface list so we don't use that freed list node
> +	 * during surface clean up later on.
> +	 */
> +	wl_list_remove(&sc->surface_list);
> +
>  	free(sc);
>  }

Acked-by me.


Thanks,
pq