diff options
| author | Jan Beulich <JBeulich@novell.com> | 2009-07-16 09:45:11 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-21 10:49:18 -0700 |
| commit | e9084ec98bb9aa3abc6cf73181177780ce7546f8 (patch) | |
| tree | 1eb7985ac722c833b083ea31c10ac92630cd55f5 /arch | |
| parent | ebe119cd0929df4878f758ebf880cb435e4dcaaf (diff) | |
| download | op-kernel-dev-e9084ec98bb9aa3abc6cf73181177780ce7546f8.zip op-kernel-dev-e9084ec98bb9aa3abc6cf73181177780ce7546f8.tar.gz | |
x86, mce: Fix set_trigger() accessor
Fix the condition checking the result of strchr() (which previously
could result in an oops), and make the function return the number of
bytes actively used.
[ Impact: fix oops ]
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <andi@firstfloor.org>
LKML-Reference: <4A5F04B7020000780000AB59@vpn.id2.novell.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 484c1e5..1cfb623 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1692,17 +1692,15 @@ static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr, const char *buf, size_t siz) { char *p; - int len; strncpy(mce_helper, buf, sizeof(mce_helper)); mce_helper[sizeof(mce_helper)-1] = 0; - len = strlen(mce_helper); p = strchr(mce_helper, '\n'); - if (*p) + if (p) *p = 0; - return len; + return strlen(mce_helper) + !!p; } static ssize_t set_ignore_ce(struct sys_device *s, |
