Commit 06d07139 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Steven Rostedt

uprobes: Change unregister/apply to WARN() if uprobe/consumer is gone

Add WARN_ON's into uprobe_unregister() and uprobe_apply() to ensure
that nobody tries to play with the dead uprobe/consumer. This helps
to catch the bugs like the one fixed by the previous patch.

In the longer term we should fix this poorly designed interface.
uprobe_register() should return "struct uprobe *" which should be
passed to apply/unregister. Plus other semantic changes, see the
changelog in commit 41ccba02.

Link: http://lkml.kernel.org/p/20140627170140.GA18322@redhat.comAcked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 48212542
...@@ -846,7 +846,7 @@ static void __uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *u ...@@ -846,7 +846,7 @@ static void __uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *u
{ {
int err; int err;
if (!consumer_del(uprobe, uc)) /* WARN? */ if (WARN_ON(!consumer_del(uprobe, uc)))
return; return;
err = register_for_each_vma(uprobe, NULL); err = register_for_each_vma(uprobe, NULL);
...@@ -927,7 +927,7 @@ int uprobe_apply(struct inode *inode, loff_t offset, ...@@ -927,7 +927,7 @@ int uprobe_apply(struct inode *inode, loff_t offset,
int ret = -ENOENT; int ret = -ENOENT;
uprobe = find_uprobe(inode, offset); uprobe = find_uprobe(inode, offset);
if (!uprobe) if (WARN_ON(!uprobe))
return ret; return ret;
down_write(&uprobe->register_rwsem); down_write(&uprobe->register_rwsem);
...@@ -952,7 +952,7 @@ void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consume ...@@ -952,7 +952,7 @@ void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consume
struct uprobe *uprobe; struct uprobe *uprobe;
uprobe = find_uprobe(inode, offset); uprobe = find_uprobe(inode, offset);
if (!uprobe) if (WARN_ON(!uprobe))
return; return;
down_write(&uprobe->register_rwsem); down_write(&uprobe->register_rwsem);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment