Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 120a3747 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Linus Torvalds
Browse files

framebuffer compat_ioctl deadlock 



Fix deadlock in fb_compat_ioctl.  fb_compat_ioctl acquires a mutex and
calls fb_ioctl that tries to acquire that mutex too.  A regression added
during BKL removal.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 51b7616e

drivers/video/fbmem.c

+2 −2
Original line number Diff line number Diff line
@@ -1262,8 +1262,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case FBIOPUT_CON2FBMAP:

		arg = (unsigned long) compat_ptr(arg);

	case FBIOBLANK:

		ret = fb_ioctl(file, cmd, arg);

		break;

		mutex_unlock(&info->lock);

		return fb_ioctl(file, cmd, arg);



	case FBIOGET_FSCREENINFO:

		ret = fb_get_fscreeninfo(inode, file, cmd, arg);