diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-18 20:58:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-18 20:58:54 +0200 |
| commit | 925a6f0bf8bd122d5d2429af7f0ca0fecf4ae71f (patch) | |
| tree | 2e896fe76b141280d291a09c126adb3cbdb1c370 | |
| parent | vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill() (diff) | |
| parent | hwspinlock/core: move the dereference below the NULL test (diff) | |
| download | linux-925a6f0bf8bd122d5d2429af7f0ca0fecf4ae71f.tar.xz linux-925a6f0bf8bd122d5d2429af7f0ca0fecf4ae71f.zip | |
Merge tag 'hwspinlock-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
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
| -rw-r--r-- | drivers/hwspinlock/hwspinlock_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c index 1201a15784c3..db713c0dfba4 100644 --- a/drivers/hwspinlock/hwspinlock_core.c +++ b/drivers/hwspinlock/hwspinlock_core.c @@ -552,7 +552,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request_specific); */ int hwspin_lock_free(struct hwspinlock *hwlock) { - struct device *dev = hwlock->bank->dev; + struct device *dev; struct hwspinlock *tmp; int ret; @@ -561,6 +561,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock) return -EINVAL; } + dev = hwlock->bank->dev; mutex_lock(&hwspinlock_tree_lock); /* make sure the hwspinlock is used */ |