Skip to content

Commit

Permalink
x86, mce: use strict_strtoull
Browse files Browse the repository at this point in the history
Use strict_strtoull instead of simple_strtoull.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Hidetoshi Seto authored and H. Peter Anvin committed May 28, 2009
1 parent 8780e8e commit 9319cec
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
9 changes: 4 additions & 5 deletions arch/x86/kernel/cpu/mcheck/mce.c
Original file line number Diff line number Diff line change
Expand Up @@ -1059,18 +1059,17 @@ static ssize_t show_bank(struct sys_device *s, struct sysdev_attribute *attr,
}

static ssize_t set_bank(struct sys_device *s, struct sysdev_attribute *attr,
const char *buf, size_t siz)
const char *buf, size_t size)
{
char *end;
u64 new = simple_strtoull(buf, &end, 0);
u64 new;

if (end == buf)
if (strict_strtoull(buf, 0, &new) < 0)
return -EINVAL;

bank[attr - bank_attrs] = new;
mce_restart();

return end-buf;
return size;
}

static ssize_t
Expand Down
16 changes: 6 additions & 10 deletions arch/x86/kernel/cpu/mcheck/mce_amd_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,12 @@ SHOW_FIELDS(interrupt_enable)
SHOW_FIELDS(threshold_limit)

static ssize_t
store_interrupt_enable(struct threshold_block *b, const char *buf, size_t count)
store_interrupt_enable(struct threshold_block *b, const char *buf, size_t size)
{
struct thresh_restart tr;
unsigned long new;
char *end;

new = simple_strtoul(buf, &end, 0);
if (end == buf)
if (strict_strtoul(buf, 0, &new) < 0)
return -EINVAL;

b->interrupt_enable = !!new;
Expand All @@ -287,18 +285,16 @@ store_interrupt_enable(struct threshold_block *b, const char *buf, size_t count)

smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);

return end - buf;
return size;
}

static ssize_t
store_threshold_limit(struct threshold_block *b, const char *buf, size_t count)
store_threshold_limit(struct threshold_block *b, const char *buf, size_t size)
{
struct thresh_restart tr;
unsigned long new;
char *end;

new = simple_strtoul(buf, &end, 0);
if (end == buf)
if (strict_strtoul(buf, 0, &new) < 0)
return -EINVAL;

if (new > THRESHOLD_MAX)
Expand All @@ -313,7 +309,7 @@ store_threshold_limit(struct threshold_block *b, const char *buf, size_t count)

smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);

return end - buf;
return size;
}

struct threshold_block_cross_cpu {
Expand Down

0 comments on commit 9319cec

Please sign in to comment.