The patch titled
markers: don't risk NULL deref in marker
has been removed from the -mm tree. Its filename was
markers-dont-risk-null-deref-in-marker.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: markers: don't risk NULL deref in marker
From: Jesper Juhl <jesper.juhl@xxxxxxxxx>
get_marker() may return NULL, so test for it.
[akpm@xxxxxxxxxxxxxxxxxxxx: coding-style fixes]
Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/marker.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff -puN kernel/marker.c~markers-dont-risk-null-deref-in-marker kernel/marker.c
--- a/kernel/marker.c~markers-dont-risk-null-deref-in-marker
+++ a/kernel/marker.c
@@ -698,14 +698,12 @@ int marker_probe_unregister(const char *
{
struct marker_entry *entry;
struct marker_probe_closure *old;
- int ret = 0;
+ int ret = -ENOENT;
mutex_lock(&markers_mutex);
entry = get_marker(name);
- if (!entry) {
- ret = -ENOENT;
+ if (!entry)
goto end;
- }
if (entry->rcu_pending)
rcu_barrier();
old = marker_entry_remove_probe(entry, probe, probe_private);
@@ -713,12 +711,15 @@ int marker_probe_unregister(const char *
marker_update_probes(); /* may update entry */
mutex_lock(&markers_mutex);
entry = get_marker(name);
+ if (!entry)
+ goto end;
entry->oldptr = old;
entry->rcu_pending = 1;
/* write rcu_pending before calling the RCU callback */
smp_wmb();
call_rcu(&entry->rcu, free_old_closure);
remove_marker(name); /* Ignore busy error message */
+ ret = 0;
end:
mutex_unlock(&markers_mutex);
return ret;
_
Patches currently in -mm which might be from jesper.juhl@xxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
