Messages in this thread Patch in this message | | | Date | Mon, 13 Sep 2010 17:47:00 -0400 | From | Mathieu Desnoyers <> | Subject | [PATCH] sched: fix string comparison in features (v2) |
| |
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 Rostedisms.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Reviewed-by: Steven Rostedt <rostedt@goodmis.org> --- kernel/sched.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Index: linux-2.6-lttng.git/kernel/sched.c =================================================================== --- linux-2.6-lttng.git.orig/kernel/sched.c +++ linux-2.6-lttng.git/kernel/sched.c @@ -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, cons 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, 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 -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com
| |