Messages in this thread Patch in this message |  | | | Date | Fri, 10 Apr 2009 12:36:45 GMT | | From | Andreas Herrmann <> | | Subject | [tip:x86/cpu] x86: cacheinfo: correct return value when cache_disable feature is not active |
| |
Commit-ID: 845d8c761ec763871936c62b837c4a9ea6d0fbdb Gitweb: http://git.kernel.org/tip/845d8c761ec763871936c62b837c4a9ea6d0fbdb Author: Andreas Herrmann <andreas.herrmann3@amd.com> AuthorDate: Thu, 9 Apr 2009 15:07:29 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Fri, 10 Apr 2009 14:21:42 +0200
x86: cacheinfo: correct return value when cache_disable feature is not active
Impact: bug fix
If user writes to "cache_disable" attribute on a CPU that does not support this feature, the process hangs due to an invalid return value in store_cache_disable().
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Mark Langsdorf <mark.langsdorf@amd.com> LKML-Reference: <20090409130729.GH31527@alberich.amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 7240126..1ab46e0 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c @@ -771,7 +771,7 @@ store_cache_disable(struct _cpuid4_info *this_leaf, const char *buf, unsigned int ret, index, val; if (!this_leaf->can_disable) - return 0; + return -EINVAL; if (strlen(buf) > 15) return -EINVAL;
|  |