From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 8 Oct 2008 02:23:36 +0000 (+0800)
Subject: markers: fix unchecked format
X-Git-Tag: v2.6.28-rc1~78^2~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=48043bcdf8f398d28e75ffed6ee85208d751f87f;p=linux-2.6-omap-h63xx.git

markers: fix unchecked format

when the second, third... probe is registered, its format is
not checked, this patch fixes it.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/marker.c b/kernel/marker.c
index 05a25776f71..3b75d0e8b5a 100644
--- a/kernel/marker.c
+++ b/kernel/marker.c
@@ -653,11 +653,17 @@ int marker_probe_register(const char *name, const char *format,
 	entry = get_marker(name);
 	if (!entry) {
 		entry = add_marker(name, format);
-		if (IS_ERR(entry)) {
+		if (IS_ERR(entry))
 			ret = PTR_ERR(entry);
-			goto end;
-		}
+	} else if (format) {
+		if (!entry->format)
+			ret = marker_set_format(&entry, format);
+		else if (strcmp(entry->format, format))
+			ret = -EPERM;
 	}
+	if (ret)
+		goto end;
+
 	/*
 	 * If we detect that a call_rcu is pending for this marker,
 	 * make sure it's executed now.