Skip to contentSkip to conversation

tracepoints: prevents null probe from being added

PATCH In review [email protected] 3 participants 3 messages Apr 15, 2013 – Apr 19, 2013 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 tracepoints: prevents null probe from being added

From: Sahara <[email protected]>

Somehow tracepoint_entry_add_probe function allows a null probe function. And, this may lead to unexpected result since the number of probe functions in an entry can be counted by checking whether probe is null or not in for-loop.
This patch prevents the null probe from being added.
In tracepoint_entry_remove_probe function, checking probe parameter within for-loop is moved out for code efficiency leaving the null probe feature which removes all probe functions in the entry.

---
 kernel/tracepoint.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
kernel/tracepoint.c +13 -8
index 0c05a45..29f2654 100644
@@ -112,7 +112,8 @@ tracepoint_entry_add_probe(struct tracepoint_entry *entry,
 	int nr_probes = 0;
 	struct tracepoint_func *old, *new;
 
-	WARN_ON(!probe);
+	if (WARN_ON(!probe))
+		return ERR_PTR(-EINVAL);
 
 	debug_print_probes(entry);
 	old = entry->funcs;
@@ -152,13 +153,18 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
 
 	debug_print_probes(entry);
 	/* (N -> M), (N > 1, M >= 0) probes */
-	for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
-		if (!probe ||
-		    (old[nr_probes].func == probe &&
-		     old[nr_probes].data == data))
-			nr_del++;
+	if (probe) {
+		for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
+			if (old[nr_probes].func == probe &&
+			     old[nr_probes].data == data)
+				nr_del++;
+		}
 	}
 
+	/*
+	 * If probe is NULL, then nr_probes = nr_del = 0, and then the
+	 * entire entry will be removed.
+	 */
 	if (nr_probes - nr_del == 0) {
 		/* N -> 0, (N > 1) */
 		entry->funcs = NULL;
@@ -173,8 +179,7 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
 		if (new == NULL)
 			return ERR_PTR(-ENOMEM);
 		for (i = 0; old[i].func; i++)
-			if (probe &&
-			    (old[i].func != probe || old[i].data != data))
+			if (old[i].func != probe || old[i].data != data)
 				new[j++] = old[i];
 		new[nr_probes - nr_del].func = NULL;
 		entry->refcount = nr_probes - nr_del;
Signature · 1 line
1.7.1
maintainer
#1 lore raw
Quoted 11 lines · On Mon, 2013-04-15 at 11:13 +0900, [email protected] wrote:

From: Sahara <[email protected]>

Somehow tracepoint_entry_add_probe function allows a null probe function. And, this may lead to unexpected result since the number of probe functions in an entry can be counted by checking whether probe is null or not in for-loop.
This patch prevents the null probe from being added.
In tracepoint_entry_remove_probe function, checking probe parameter within for-loop is moved out for code efficiency leaving the null probe feature which removes all probe functions in the entry.

Quoted 3 lines

BTW, do not add tags that were not given to you. "Reviewed-by" has a meaning, more than just someone that reviewed your patch. It means that they not only reviewed your patch but couldn't find anything wrong with it. As both Mathieu and I had comments, that does not deserve a "Reviewed-by" tag.

I'm not even sure that Mathieu gave an "Acked-by". I thought he did, but I can't seem to find it. Mathieu?

Anyway, I'll start testing this patch as it seems fine with me (although I still wouldn't give a Reviewed-by tag).

Thanks,

-- Steve

Quoted 52 lines
---
 kernel/tracepoint.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
kernel/tracepoint.c +13 -8
index 0c05a45..29f2654 100644
@@ -112,7 +112,8 @@ tracepoint_entry_add_probe(struct tracepoint_entry *entry,
 	int nr_probes = 0;
 	struct tracepoint_func *old, *new;
 
-	WARN_ON(!probe);
+	if (WARN_ON(!probe))
+		return ERR_PTR(-EINVAL);
 
 	debug_print_probes(entry);
 	old = entry->funcs;
@@ -152,13 +153,18 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
 
 	debug_print_probes(entry);
 	/* (N -> M), (N > 1, M >= 0) probes */
-	for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
-		if (!probe ||
-		    (old[nr_probes].func == probe &&
-		     old[nr_probes].data == data))
-			nr_del++;
+	if (probe) {
+		for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
+			if (old[nr_probes].func == probe &&
+			     old[nr_probes].data == data)
+				nr_del++;
+		}
 	}
 
+	/*
+	 * If probe is NULL, then nr_probes = nr_del = 0, and then the
+	 * entire entry will be removed.
+	 */
 	if (nr_probes - nr_del == 0) {
 		/* N -> 0, (N > 1) */
 		entry->funcs = NULL;
@@ -173,8 +179,7 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
 		if (new == NULL)
 			return ERR_PTR(-ENOMEM);
 		for (i = 0; old[i].func; i++)
-			if (probe &&
-			    (old[i].func != probe || old[i].data != data))
+			if (old[i].func != probe || old[i].data != data)
 				new[j++] = old[i];
 		new[nr_probes - nr_del].func = NULL;
 		entry->refcount = nr_probes - nr_del;
reviewer Reviewed-by Acked-by
#2 lore raw
Quoted 16 lines · * Steven Rostedt ([email protected]) wrote:
Quoted 11 lines · On Mon, 2013-04-15 at 11:13 +0900, [email protected] wrote:

From: Sahara <[email protected]>

Somehow tracepoint_entry_add_probe function allows a null probe function. And, this may lead to unexpected result since the number of probe functions in an entry can be counted by checking whether probe is null or not in for-loop.
This patch prevents the null probe from being added.
In tracepoint_entry_remove_probe function, checking probe parameter within for-loop is moved out for code efficiency leaving the null probe feature which removes all probe functions in the entry.

Quoted 3 lines
Quoted 8 lines

BTW, do not add tags that were not given to you. "Reviewed-by" has a meaning, more than just someone that reviewed your patch. It means that they not only reviewed your patch but couldn't find anything wrong with it. As both Mathieu and I had comments, that does not deserve a "Reviewed-by" tag.

I'm not even sure that Mathieu gave an "Acked-by". I thought he did, but I can't seem to find it. Mathieu?

I don't recall, but all my comments were addressed. In order to clear any confusion:

Thanks,

Mathieu

Quoted 62 lines

Anyway, I'll start testing this patch as it seems fine with me (although I still wouldn't give a Reviewed-by tag).

Thanks,

-- Steve

Quoted 52 lines
---
 kernel/tracepoint.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
kernel/tracepoint.c +13 -8
index 0c05a45..29f2654 100644
@@ -112,7 +112,8 @@ tracepoint_entry_add_probe(struct tracepoint_entry *entry,
 	int nr_probes = 0;
 	struct tracepoint_func *old, *new;
 
-	WARN_ON(!probe);
+	if (WARN_ON(!probe))
+		return ERR_PTR(-EINVAL);
 
 	debug_print_probes(entry);
 	old = entry->funcs;
@@ -152,13 +153,18 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
 
 	debug_print_probes(entry);
 	/* (N -> M), (N > 1, M >= 0) probes */
-	for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
-		if (!probe ||
-		    (old[nr_probes].func == probe &&
-		     old[nr_probes].data == data))
-			nr_del++;
+	if (probe) {
+		for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
+			if (old[nr_probes].func == probe &&
+			     old[nr_probes].data == data)
+				nr_del++;
+		}
 	}
 
+	/*
+	 * If probe is NULL, then nr_probes = nr_del = 0, and then the
+	 * entire entry will be removed.
+	 */
 	if (nr_probes - nr_del == 0) {
 		/* N -> 0, (N > 1) */
 		entry->funcs = NULL;
@@ -173,8 +179,7 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
 		if (new == NULL)
 			return ERR_PTR(-ENOMEM);
 		for (i = 0; old[i].func; i++)
-			if (probe &&
-			    (old[i].func != probe || old[i].data != data))
+			if (old[i].func != probe || old[i].data != data)
 				new[j++] = old[i];
 		new[nr_probes - nr_del].func = NULL;
 		entry->refcount = nr_probes - nr_del;
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com