summaryrefslogtreecommitdiffstats
path: root/elaborate.cxx
diff options
context:
space:
mode:
authorTim Moore <timoore@redhat.com>2009-10-27 19:50:06 +0100
committerTim Moore <timoore@redhat.com>2009-10-27 19:50:06 +0100
commitf70d5f6b702e8da5c6affb3f34836c466b01f1b9 (patch)
tree46954ea80adcd97d18e21ecd1357b075d97f7e50 /elaborate.cxx
parent8447d5545aa58965a5f47d604e14e97e673d1cd9 (diff)
parent618a8a634b37da88b67a49beec7282634bff3efe (diff)
downloadsystemtap-steved-f70d5f6b702e8da5c6affb3f34836c466b01f1b9.tar.gz
systemtap-steved-f70d5f6b702e8da5c6affb3f34836c466b01f1b9.tar.xz
systemtap-steved-f70d5f6b702e8da5c6affb3f34836c466b01f1b9.zip
Merge branch 'master' of ssh://sourceware.org/git/systemtap
Diffstat (limited to 'elaborate.cxx')
-rw-r--r--elaborate.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/elaborate.cxx b/elaborate.cxx
index c3f29603..626db280 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -157,7 +157,9 @@ derived_probe::emit_process_owner_assertion (translator_output* o)
o->newline() << " \"Internal Error: Process %d does not belong to user %d in probe %s in --unprivileged mode\",";
o->newline() << " current->tgid, _stp_uid, c->probe_point);";
o->newline() << "c->last_error = c->error_buffer;";
- o->newline() << "goto out;";
+ // NB: since this check occurs before probe locking, its exit should
+ // not be a "goto out", which would attempt unlocking.
+ o->newline() << "return;";
o->newline(-1) << "}";
o->newline(-1) << "#endif";
}