X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdebug.c;h=c0d87da9147375518bd4b1ccc1fb602360d5835b;hb=867319ec5f9030d3c14c32e3302606f2bf11ac27;hp=8daa03240ea857dfc4860338451f59134dde49af;hpb=24a6cf4533118e04367f7fcdc6eadaa4e2dfbc56;p=libguestfs.git diff --git a/daemon/debug.c b/daemon/debug.c index 8daa032..c0d87da 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -24,7 +24,9 @@ #include #include #include +#include #include +#include #include "../src/guestfs_protocol.h" #include "daemon.h" @@ -51,9 +53,11 @@ static char *debug_ls (const char *subcmd, int argc, char *const *const argv); static char *debug_ll (const char *subcmd, int argc, char *const *const argv); static char *debug_segv (const char *subcmd, int argc, char *const *const argv); static char *debug_sh (const char *subcmd, int argc, char *const *const argv); +static char *debug_core_pattern (const char *subcmd, int argc, char *const *const argv); static struct cmd cmds[] = { { "help", debug_help }, + { "core_pattern", debug_core_pattern }, { "env", debug_env }, { "fds", debug_fds }, { "ls", debug_ls }, @@ -80,7 +84,7 @@ do_debug (const char *subcmd MAYBE_UNUSED, char *const *argv MAYBE_UNUSED) argc++; for (i = 0; cmds[i].cmd != NULL; ++i) { - if (strcasecmp (subcmd, cmds[i].cmd) == 0) + if (STRCASEEQ (subcmd, cmds[i].cmd)) return cmds[i].f (subcmd, argc, argv); } @@ -150,7 +154,7 @@ debug_fds (const char *subcmd, int argc, char *const *const argv) } while ((d = readdir (dir)) != NULL) { - if (strcmp (d->d_name, ".") == 0 || strcmp (d->d_name, "..") == 0) + if (STREQ (d->d_name, ".") || STREQ (d->d_name, "..")) continue; snprintf (fname, sizeof fname, "/proc/self/fd/%s", d->d_name); @@ -203,22 +207,18 @@ debug_segv (const char *subcmd, int argc, char *const *const argv) * * Note this is somewhat different from the ordinary guestfs_sh command * because it's not using the guest shell, and is not chrooted. - * - * Also we ignore any errors and you can see the full output if you - * add 2>&1 to the end of the command string. */ static char * debug_sh (const char *subcmd, int argc, char *const *const argv) { - char *cmd; - int len, i, j; - char *out; - if (argc < 1) { - reply_with_error ("debug: sh: expecting a command to run"); + reply_with_error ("sh: expecting a command to run"); return NULL; } + char *cmd; + int len, i, j; + /* guestfish splits the parameter(s) into a list of strings, * and we have to reassemble them here. Not ideal. XXX */ @@ -238,9 +238,27 @@ debug_sh (const char *subcmd, int argc, char *const *const argv) } cmd[j-1] = '\0'; - command (&out, NULL, "/bin/sh", "-c", cmd, NULL); + /* Set up some environment variables. */ + setenv ("root", sysroot, 1); + if (access ("/sys/block/sda", F_OK) == 0) + setenv ("sd", "sd", 1); + else if (access ("/sys/block/hda", F_OK) == 0) + setenv ("sd", "hd", 1); + else if (access ("/sys/block/vda", F_OK) == 0) + setenv ("sd", "vd", 1); + + char *err; + int r = commandf (NULL, &err, COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, + "/bin/sh", "-c", cmd, NULL); free (cmd); - return out; + + if (r == -1) { + reply_with_error ("%s", err); + free (err); + return NULL; + } + + return err; } /* Print the environment that commands get (by running external printenv). */ @@ -323,4 +341,112 @@ debug_ll (const char *subcmd, int argc, char *const *const argv) return out; } +/* Enable core dumping to the given core pattern. + * Note that this pattern is relative to any chroot of the process which + * crashes. This means that if you want to write the core file to the guest's + * storage the pattern must start with /sysroot only if the command which + * crashes doesn't chroot. + */ +static char * +debug_core_pattern (const char *subcmd, int argc, char *const *const argv) +{ + if (argc < 1) { + reply_with_error ("core_pattern: expecting a core pattern"); + return NULL; + } + + const char *pattern = argv[0]; + const size_t pattern_len = strlen(pattern); + +#define CORE_PATTERN "/proc/sys/kernel/core_pattern" + int fd = open (CORE_PATTERN, O_WRONLY); + if (fd == -1) { + reply_with_perror ("open: " CORE_PATTERN); + return NULL; + } + if (write (fd, pattern, pattern_len) < (ssize_t) pattern_len) { + reply_with_perror ("write: " CORE_PATTERN); + return NULL; + } + if (close (fd) == -1) { + reply_with_perror ("close: " CORE_PATTERN); + return NULL; + } + + struct rlimit limit = { + .rlim_cur = RLIM_INFINITY, + .rlim_max = RLIM_INFINITY + }; + if (setrlimit (RLIMIT_CORE, &limit) == -1) { + reply_with_perror ("setrlimit (RLIMIT_CORE)"); + return NULL; + } + + char *ret = strdup ("ok"); + if (NULL == ret) { + reply_with_perror ("strdup"); + return NULL; + } + + return ret; +} + #endif /* ENABLE_DEBUG_COMMAND */ + +#if ENABLE_DEBUG_COMMAND +static int +write_cb (void *fd_ptr, const void *buf, size_t len) +{ + int fd = *(int *)fd_ptr; + return xwrite (fd, buf, len); +} +#endif + +/* Has one FileIn parameter. */ +int +do_debug_upload (const char *filename MAYBE_UNUSED, int mode MAYBE_UNUSED) +{ +#if ENABLE_DEBUG_COMMAND + /* Not chrooted - this command lets you upload a file to anywhere + * in the appliance. + */ + int fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, mode); + + if (fd == -1) { + int err = errno; + cancel_receive (); + errno = err; + reply_with_perror ("%s", filename); + return -1; + } + + int r = receive_file (write_cb, &fd); + if (r == -1) { /* write error */ + int err = errno; + cancel_receive (); + errno = err; + reply_with_error ("write error: %s", filename); + close (fd); + return -1; + } + if (r == -2) { /* cancellation from library */ + close (fd); + /* Do NOT send any error. */ + return -1; + } + + if (close (fd) == -1) { + int err = errno; + if (r == -1) /* if r == 0, file transfer ended already */ + cancel_receive (); + errno = err; + reply_with_perror ("close: %s", filename); + return -1; + } + + return 0; +#else + reply_with_error ("guestfsd was not configured with --enable-debug-command"); + return NULL; +#endif +}