[PATCH weston] compositor-fbdev: fix VT switching crash

[Pekka Paalanen]

On Wed, 19 Aug 2015 10:21:07 -0500
Derek Foreman <derekf at osg.samsung.com> wrote:

> Ouch,
> 
> Reviewed-by: Derek Foreman <derekf at osg.samsung.com>
> 
> On 19/08/15 06:03 AM, Pekka Paalanen wrote:
> > From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> > 
> > This bug was introduced in 954f183e2f9891b241c1efc0ea61ed56019a4326.
> > 
> > The session_notify() data was accidentally cast to fbdev_backend while
> > it is weston_compositor. This was possibly due to the code before the
> > mentioned commit casting data directly to fbdev_compositor without going
> > through the intended type first, which worked only because
> > weston_compositor was the first member in struct fbdev_compositor.
> > 
> > Fix the casts to be the right way around.
> > 
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91654
> > Cc: nerdopolis1 at verizon.net
> > Cc: Giulio Camuffo <giuliocamuffo at gmail.com>
> > Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> > ---
> >  src/compositor-fbdev.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
> > index 051a381..a5c7947 100644
> > --- a/src/compositor-fbdev.c
> > +++ b/src/compositor-fbdev.c
> > @@ -756,8 +756,8 @@ fbdev_backend_destroy(struct weston_compositor *base)
> >  static void
> >  session_notify(struct wl_listener *listener, void *data)
> >  {
> > -	struct fbdev_backend *backend = data;
> > -	struct weston_compositor *compositor = backend->compositor;
> > +	struct weston_compositor *compositor = data;
> > +	struct fbdev_backend *backend = to_fbdev_backend(compositor);
> >  	struct weston_output *output;
> >  
> >  	if (compositor->session_active) {
> > 

Pushed:
   2b25450..3f89794  master -> master


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20150820/3f13ce89/attachment.sig>