linux-kernel - [tip:sched/core] sched: Fix string comparison in /proc/sched

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-7740191cd909b75d75685fb08a5d1f54b8a9d28b@git.kernel.org>
Date:	Tue, 14 Sep 2010 12:21:54 GMT
From:	tip-bot for Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	mathieu.desnoyers@...icios.com, peterz@...radead.org,
	tony@...mide.com, rostedt@...dmis.org, stable@...nel.org,
	tglx@...utronix.de, mingo@...e.hu
Subject: [tip:sched/core] sched: Fix string comparison in /proc/sched_features

Commit-ID:  7740191cd909b75d75685fb08a5d1f54b8a9d28b
Gitweb:     http://git.kernel.org/tip/7740191cd909b75d75685fb08a5d1f54b8a9d28b
Author:     Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
AuthorDate: Mon, 13 Sep 2010 17:47:00 -0400
Committer:  Ingo Molnar <mingo@...e.hu>
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 <mathieu.desnoyers@...icios.com>
Reviewed-by: Steven Rostedt <rostedt@...dmis.org>
Cc: <stable@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Tony Lindgren <tony@...mide.com>
LKML-Reference: <20100913214700.GB16118@...stal>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 kernel/sched.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index 26f83e2..b40b82e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/