summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2017-07-14 14:49:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-14 15:05:13 -0700
commit9049f2f6e7bdfb5de0c63c2635bf3cdb70c4efb5 (patch)
tree718c3ee2245ca615b30d4bef469f3ab2195530e9 /fs
parentecaad81ca0dfaa5f6ab7a5a9bc16a10816e2bd27 (diff)
downloadlinux-9049f2f6e7bdfb5de0c63c2635bf3cdb70c4efb5.tar.bz2
fault-inject: parse as natural 1-based value for fail-nth write interface
The value written to fail-nth file is parsed as 0-based. Parsing as one-based is more natural to understand and it enables to cancel the previous setup by simply writing '0'. This change also converts task->fail_nth from signed to unsigned int. Link: http://lkml.kernel.org/r/1491490561-10485-3-git-send-email-akinobu.mita@gmail.com Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/base.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5d93512beea1..c1fdaecb8d23 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1360,7 +1360,8 @@ static ssize_t proc_fail_nth_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
struct task_struct *task;
- int err, n;
+ int err;
+ unsigned int n;
task = get_proc_task(file_inode(file));
if (!task)
@@ -1368,12 +1369,10 @@ static ssize_t proc_fail_nth_write(struct file *file, const char __user *buf,
put_task_struct(task);
if (task != current)
return -EPERM;
- err = kstrtoint_from_user(buf, count, 0, &n);
+ err = kstrtouint_from_user(buf, count, 0, &n);
if (err)
return err;
- if (n < 0 || n == INT_MAX)
- return -EINVAL;
- current->fail_nth = n + 1;
+ current->fail_nth = n;
return count;
}