From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753066Ab0IKRoF (ORCPT ); Sat, 11 Sep 2010 13:44:05 -0400 Received: from mail.openrapids.net ([64.15.138.104]:57487 "EHLO blackscsi.openrapids.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751525Ab0IKRoE (ORCPT ); Sat, 11 Sep 2010 13:44:04 -0400 Date: Sat, 11 Sep 2010 13:44:00 -0400 From: Mathieu Desnoyers To: LKML , Peter Zijlstra Cc: Ingo Molnar , Steven Rostedt , Mathieu Desnoyers , Tony Lindgren Subject: [PATCH] sched: fix string comparison in features Message-ID: <20100911174400.GA13462@Krystal> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Editor: vi X-Info: http://www.efficios.com X-Operating-System: Linux/2.6.26-2-686 (i686) X-Uptime: 13:40:39 up 231 days, 20:17, 6 users, load average: 0.05, 0.03, 0.00 User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Incorrect handling of the following case: INTERACTIVE INTERACTIVE_SOMETHING_ELSE The comparison only checks up to each element's length. Signed-off-by: Mathieu Desnoyers --- kernel/sched.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 @@ -722,7 +722,7 @@ sched_feat_write(struct file *filp, cons { char buf[64]; char *cmp = buf; - int neg = 0; + int neg = 0, cmplen; int i; if (cnt > 63) @@ -732,15 +732,24 @@ sched_feat_write(struct file *filp, cons return -EFAULT; buf[cnt] = 0; + for (i = 0; i < cnt; i++) { + if (buf[i] == '\n' || buf[i] == ' ') { + buf[i] = 0; + break; + } + } if (strncmp(buf, "NO_", 3) == 0) { neg = 1; cmp += 3; } + cmplen = strlen(cmp); for (i = 0; sched_feat_names[i]; i++) { int len = strlen(sched_feat_names[i]); + if (cmplen != len) + continue; if (strncmp(cmp, sched_feat_names[i], len) == 0) { if (neg) sysctl_sched_features &= ~(1UL << i); -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com