mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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: Mikulas Patocka <[email protected]> Cc: Alan Cox <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
51b7616e36
commit
120a37470c
1 changed files with 2 additions and 2 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue