The patch titled
fix spinlock usage in hysdn_log_close()
has been added to the -mm tree. Its filename is
fix-spinlock-usage-in-hysdn_log_close.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix spinlock usage in hysdn_log_close()
From: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
Fix incorrect spinlock use in hysdn_log_close(). The function declared a
spinlock on the stack and used it to 'protect' a shared driver structure.
the patch removes the declaration of hysdn_lock and uses card->hysdn_lock
instead.
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
Cc: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/isdn/hysdn/hysdn_proclog.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff -puN drivers/isdn/hysdn/hysdn_proclog.c~fix-spinlock-usage-in-hysdn_log_close drivers/isdn/hysdn/hysdn_proclog.c
--- a/drivers/isdn/hysdn/hysdn_proclog.c~fix-spinlock-usage-in-hysdn_log_close
+++ a/drivers/isdn/hysdn/hysdn_proclog.c
@@ -298,7 +298,6 @@ hysdn_log_close(struct inode *ino, struc
hysdn_card *card;
int retval = 0;
unsigned long flags;
- spinlock_t hysdn_lock = SPIN_LOCK_UNLOCKED;
lock_kernel();
if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_WRITE) {
@@ -308,7 +307,7 @@ hysdn_log_close(struct inode *ino, struc
/* read access -> log/debug read, mark one further file as closed */
pd = NULL;
- spin_lock_irqsave(&hysdn_lock, flags);
+ spin_lock_irqsave(&card->hysdn_lock, flags);
inf = *((struct log_data **) filep->private_data); /* get first log entry */
if (inf)
pd = (struct procdata *) inf->proc_ctrl; /* still entries there */
@@ -331,7 +330,7 @@ hysdn_log_close(struct inode *ino, struc
inf->usage_cnt--; /* decrement usage count for buffers */
inf = inf->next;
}
- spin_unlock_irqrestore(&hysdn_lock, flags);
+ spin_unlock_irqrestore(&card->hysdn_lock, flags);
if (pd)
if (pd->if_used <= 0) /* delete buffers if last file closed */
_
Patches currently in -mm which might be from matthias.kaehlcke@xxxxxxxxx are
origin.patch
irda_device_dongle_init-fix-kzallocgfp_kernel-in-spinlock.patch
qla1280-use-dma_64bit_mask-instead-of-0ull.patch
include-kern_-constant-in-printk-calls-in-mm-slabc.patch
srmcons-fix-kmallocgfp_kernel-inside-spinlock.patch
fix-spinlock-usage-in-hysdn_log_close.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
