diff options
author | Frank Ch. Eigler <fche@elastic.org> | 2008-02-22 21:10:25 -0500 |
---|---|---|
committer | Frank Ch. Eigler <fche@elastic.org> | 2008-02-22 21:10:25 -0500 |
commit | 6abaaba810bb1804c68b47d3bf8157ec2bd9eb00 (patch) | |
tree | 65dcdf60b9a391eb1f3b6a488cae0b7cae111088 /runtime/staprun/staprun_funcs.c | |
parent | 9a6524b486ecf0671b924a1c8b9d439a40810505 (diff) | |
parent | 780c08c8f4d5020052d3de50dfc3abacac589feb (diff) | |
download | systemtap-steved-6abaaba810bb1804c68b47d3bf8157ec2bd9eb00.tar.gz systemtap-steved-6abaaba810bb1804c68b47d3bf8157ec2bd9eb00.tar.xz systemtap-steved-6abaaba810bb1804c68b47d3bf8157ec2bd9eb00.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/staprun/staprun_funcs.c')
-rw-r--r-- | runtime/staprun/staprun_funcs.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c index 3a678405..34e12c25 100644 --- a/runtime/staprun/staprun_funcs.c +++ b/runtime/staprun/staprun_funcs.c @@ -277,10 +277,20 @@ check_path(void) /* Use realpath() to canonicalize the module path. */ if (realpath(modpath, module_realpath) == NULL) { - perr("Unable to canonicalize path \"%s\"",modpath); + perr("Unable to canonicalize path \"%s\"", modpath); return -1; } + /* To make sure the user can't specify something like + * /lib/modules/`uname -r`/systemtapmod.ko, put a '/' on the + * end of staplib_dir_realpath. */ + if (strlen(staplib_dir_realpath) < (PATH_MAX - 1)) + strcat(staplib_dir_realpath, "/"); + else { + err("Path \"%s\" is too long.", modpath); + return -1; + } + /* Now we've got two canonicalized paths. Make sure * module_realpath starts with staplib_dir_realpath. */ if (strncmp(staplib_dir_realpath, module_realpath, |