diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:41:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:41:17 -0800 |
| commit | a205b082189bf914959a667a5c83ea145bba3fb5 (patch) | |
| tree | 8e4a05c7eebe9039136d2880e64dc782b73a1c1a /arch | |
| parent | 455ba0c0b7e1d2c72a45808115ef35512e3ae7b0 (diff) | |
| parent | 913050b91eb94f194392dd797b1ff3779f606ac0 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
oprofile: Fix uninitialized memory access when writing to writing to oprofilefs
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/oprofile/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index 6efc18b5e60a..bd58b72454cf 100644 --- a/arch/s390/oprofile/init.c +++ b/arch/s390/oprofile/init.c @@ -88,7 +88,7 @@ static ssize_t hwsampler_write(struct file *file, char const __user *buf, return -EINVAL; retval = oprofilefs_ulong_from_user(&val, buf, count); - if (retval) + if (retval <= 0) return retval; if (oprofile_started) |