lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

Browse Source 
Pull hwspinlock fix from Ohad Ben-Cohen:
 "A single hwspinlock fix by Wei Yongjun, which prevents potential NULL
  dereferences"

* tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock/core: move the dereference below the NULL test
This commit is contained in:
Linus Torvalds
2012-09-18 11:58:54 -07:00
parent b161dfa693 e352614cd3
commit 925a6f0bf8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/hwspinlock/hwspinlock_core.c
View File

@@ -552,7 +552,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request_specific);
*/ */
int hwspin_lock_free(struct hwspinlock *hwlock) int hwspin_lock_free(struct hwspinlock *hwlock)
{ {
struct device *dev = hwlock->bank->dev; struct device *dev;
struct hwspinlock *tmp; struct hwspinlock *tmp;
int ret; int ret;
@@ -561,6 +561,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock)
return -EINVAL; return -EINVAL;
} }
dev = hwlock->bank->dev;
mutex_lock(&hwspinlock_tree_lock); mutex_lock(&hwspinlock_tree_lock);
/* make sure the hwspinlock is used */ /* make sure the hwspinlock is used */