LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Keith Packard <keithp@keithp.com>
To: linux-kernel@vger.kernel.org
Cc: Keith Packard <keithp@keithp.com>
Subject: [PATCH] [drivers/video/fb] Eliminate recursive mutex in compat fb ioctl path
Date: Sun,  2 Nov 2008 23:06:50 -0800	[thread overview]
Message-ID: <1225696010-6574-1-git-send-email-keithp@keithp.com> (raw)

fb_compat_ioctl grabbed the fb mutex and then called fb_ioctl, which also
grabs the same mutex. I traced through all existing fb_compat_ioctl
functions in the various fb drivers and found that they also transform their
arguments and call the native fb_ioctl function. So, it is correct to just
remove the mutex_lock/mutex_unlock pair in the top-level compat path.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 drivers/video/fbmem.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index cd5f20d..548cf26 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1253,7 +1253,6 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	struct fb_ops *fb = info->fbops;
 	long ret = -ENOIOCTLCMD;
 
-	mutex_lock(&info->lock);
 	switch(cmd) {
 	case FBIOGET_VSCREENINFO:
 	case FBIOPUT_VSCREENINFO:
@@ -1279,7 +1278,6 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			ret = fb->fb_compat_ioctl(info, cmd, arg);
 		break;
 	}
-	mutex_unlock(&info->lock);
 	return ret;
 }
 #endif
-- 
1.5.6.5


             reply	other threads:[~2008-11-03  7:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-03  7:06 Keith Packard [this message]
2008-11-03 10:12 ` [PATCH] [drivers/video/fb] Eliminate recursive mutex in compat fb ioctl path Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1225696010-6574-1-git-send-email-keithp@keithp.com \
    --to=keithp@keithp.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).