hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 41ccba029e.

Link: http://lkml.kernel.org/p/20140627170140.GA18322@redhat.com

Acked-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Oleg Nesterov 2014-06-27 19:01:40 +02:00 committed by Steven Rostedt
parent 4821254206
commit 06d0713904
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/events/uprobes.c
View File

@ -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,
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
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);