From: Peter Huewe <peterhuewe@gmx.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Dan Carpenter <dan.carpenter@oracle.com>,
Peter Huewe <peterhuewe@gmx.de>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 02/14] staging/xgifb: Add mutext for fb_mmap locking
Date: Thu, 14 Jun 2012 00:21:40 +0200 [thread overview]
Message-ID: <1339626112-20671-2-git-send-email-peterhuewe@gmx.de> (raw)
In-Reply-To: <1339626112-20671-1-git-send-email-peterhuewe@gmx.de>
This adds a mutex for fb_mmap around smem_start and smem_len
so the mutex inside the fb_mmap() is actually used. Changing of
these fields before calling the framebuffer_register() are not mutexed.
We check whether framebuffer_register has been called by reading
fbinfo->count.
See 537a1bf0 - "fbdev: add mutex for fb_mmap locking" by Krzysztof Helt
for details.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
drivers/staging/xgifb/XGI_main_26.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index ff88f1d..f427b85 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1350,10 +1350,17 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
strncpy(fix->id, "XGI", sizeof(fix->id) - 1);
- fix->smem_start = xgifb_info->video_base;
+ /* if register_framebuffer has been called, we must lock */
+ if (atomic_read(&info->count))
+ mutex_lock(&info->mm_lock);
+ fix->smem_start = xgifb_info->video_base;
fix->smem_len = xgifb_info->video_size;
+ /* if register_framebuffer has been called, we can unlock */
+ if (atomic_read(&info->count))
+ mutex_unlock(&info->mm_lock);
+
fix->type = FB_TYPE_PACKED_PIXELS;
fix->type_aux = 0;
if (xgifb_info->video_bpp == 8)
--
1.7.3.4
next prev parent reply other threads:[~2012-06-13 22:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 22:21 [PATCH 01/14] staging/xgifb: Remove assignments without effect Peter Huewe
2012-06-13 22:21 ` Peter Huewe [this message]
2012-06-13 22:21 ` [PATCH 03/14] staging/xgifb: Add header #include guards to vb_table.h Peter Huewe
2012-06-13 22:21 ` [PATCH 04/14] staging/xgifb: Remove superfluous header includes Peter Huewe
2012-06-13 22:21 ` [PATCH 05/14] staging/xgifb: Consolidate XGINew_SetDRAMSize{,20}Reg Peter Huewe
2012-06-13 22:21 ` [PATCH 06/14] staging/xgifb: Remove duplicated code from XGINew_DDRSizing340 Peter Huewe
2012-06-13 22:21 ` [PATCH 07/14] staging/xgifb: Inline XGINew_SetDRAMSizingType Peter Huewe
2012-06-13 22:21 ` [PATCH 08/14] staging/xgifb: Remove unnecessary fields of XGINew_DDRDRAM_TYPE{340,20} Peter Huewe
2012-06-13 22:21 ` [PATCH 09/14] staging/xgifb: Replace constant arrays with constant values Peter Huewe
2012-06-13 22:21 ` [PATCH 10/14] staging/xgifb: Simplyfy XGI_GetVCLK2Ptr a bit Peter Huewe
2012-06-13 22:21 ` [PATCH 11/14] staging/xgifb: Remove useless function XGI_CloseCRTC Peter Huewe
2012-06-13 22:21 ` [PATCH 12/14] staging/xgifb: Replace delay lookup tables with constant values Peter Huewe
2012-06-13 22:21 ` [PATCH 13/14] staging/xgifb: Use SiS structs Peter Huewe
2012-06-13 22:21 ` [PATCH 14/14] staging/xgifb: Cleanup vb_device_info struct Peter Huewe
2012-06-14 9:36 ` Dan Carpenter
[not found] ` <bf2c5063-2ce7-40f8-9980-04d1666eb76f@email.android.com>
2012-06-14 11:50 ` Dan Carpenter
2012-06-14 11:04 ` Dan Carpenter
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=1339626112-20671-2-git-send-email-peterhuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=aaro.koskinen@iki.fi \
--cc=arnaud.patard@rtp-net.org \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--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
all inboxes | Powered by JetHome®