sched: fix string comparison in features (v2)
PATCH 1/1 sched: fix string comparison in features (v2)
Fix incorrect handling of the following case:
INTERACTIVEINTERACTIVE_SOMETHING_ELSE
The comparison only checks up to each element's length.
Changelog since v1:
- Embellish using some Rostedisms.
Signed-off-by Mathieu Desnoyers <[email protected]>
Reviewed-by Steven Rostedt <[email protected]>
--- kernel/sched.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/sched.c +3 -4
@@ -721,7 +721,7 @@ sched_feat_write(struct file *filp, cons size_t cnt, loff_t *ppos) { char buf[64]; -char *cmp = buf; +char *cmp;int neg =0 ;int i;
@@ -732,6 +732,7 @@ sched_feat_write(struct file *filp, consreturn -EFAULT ; buf[cnt] =0 ; + cmp =strstrip (buf);if (strncmp (buf,"NO_" ,3 ) ==0 ) { neg =1 ;
@@ -739,9 +740,7 @@ sched_feat_write(struct file *filp, cons }for (i =0 ; sched_feat_names[i]; i++) { -int len =strlen (sched_feat_names[i]); - -if (strncmp (cmp, sched_feat_names[i], len) ==0 ) { +if (strcmp (cmp, sched_feat_names[i]) ==0 ) {if (neg) sysctl_sched_features &= ~(1UL << i);else
Signature · 4 lines
Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
[tip:sched/core] sched: Fix string comparison in /proc/sched_features
Commit-ID: 7740191cd909b75d75685fb08a5d1f54b8a9d28b Gitweb: http://git.kernel.org/tip/7740191cd909b75d75685fb08a5d1f54b8a9d28b Author: Mathieu Desnoyers <[email protected]> AuthorDate: Mon, 13 Sep 2010 17:47:00 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 14 Sep 2010 13:23:45 +0200
sched: Fix string comparison in /proc/sched_features
Fix incorrect handling of the following case:
INTERACTIVE
INTERACTIVE_SOMETHING_ELSE
The comparison only checks up to each element's length.
Changelog since v1:
- Embellish using some Rostedtisms.
[ mingo: ^^ == smaller and cleaner ]
Signed-off-by Mathieu Desnoyers <[email protected]>
Reviewed-by Steven Rostedt <[email protected]>
Cc <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Tony Lindgren <[email protected]>
LKML-Reference: <20100913214700.GB16118@Krystal>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
kernel/sched.c +3 -4
@@ -721,7 +721,7 @@ sched_feat_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) { char buf[64]; -char *cmp = buf; +char *cmp;int neg =0 ;int i;
@@ -732,6 +732,7 @@ sched_feat_write(struct file *filp, const char __user *ubuf,return -EFAULT ; buf[cnt] =0 ; + cmp =strstrip (buf);if (strncmp (buf,"NO_" ,3 ) ==0 ) { neg =1 ;
@@ -739,9 +740,7 @@ sched_feat_write(struct file *filp, const char __user *ubuf, }for (i =0 ; sched_feat_names[i]; i++) { -int len =strlen (sched_feat_names[i]); - -if (strncmp (cmp, sched_feat_names[i], len) ==0 ) { +if (strcmp (cmp, sched_feat_names[i]) ==0 ) {if (neg) sysctl_sched_features &= ~(1UL << i);else