Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qfile-dom0-unpacker: do not use gui-fatal

Browse Source 
most errors are reported to sending party, the only local left are pretty
unlikely to happen, so simply log them to logfile (stderr).
This commit is contained in:
Marek Marczykowski 2013-03-07 03:57:27 +01:00
parent f4c37be03a
commit 5670f4de77
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom0/qubes_rpc/Makefile
View File

@ -1,4 +1,4 @@
CC=gcc CC=gcc
CFLAGS=-g -Wall -I../../qubes_rpc -fPIC -pie CFLAGS=-g -Wall -I../../qubes_rpc -fPIC -pie
qfile-dom0-unpacker: qfile-dom0-unpacker.o ../../qubes_rpc/ioall.o ../../qubes_rpc/gui-fatal.o ../../qubes_rpc/copy_file.o ../../qubes_rpc/unpack.o ../../qubes_rpc/crc32.o qfile-dom0-unpacker: qfile-dom0-unpacker.o ../../qubes_rpc/ioall.o ../../qubes_rpc/copy_file.o ../../qubes_rpc/unpack.o ../../qubes_rpc/crc32.o
$(CC) -pie -g -o $@ $^ $(CC) -pie -g -o $@ $^

28
dom0/qubes_rpc/qfile-dom0-unpacker.c
View File

@ -9,7 +9,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/fsuid.h> #include <sys/fsuid.h>
#include <gui-fatal.h>
#include <errno.h> #include <errno.h>
#include "filecopy.h" #include "filecopy.h"
@ -37,21 +36,6 @@ int prepare_creds_return_uid(char *username)
return pwd->pw_uid; return pwd->pw_uid;
} }
void wait_for_child(int statusfd)
{
int status;
if (read(statusfd, &status, sizeof status)!=sizeof status)
gui_fatal("File copy error: Internal error reading status from unpacker");
errno = status;
switch (status) {
case LEGAL_EOF: break;
case 0: gui_fatal("File copy: Connection terminated unexpectedly"); break;
case EINVAL: gui_fatal("File copy: Corrupted data from packer"); break;
case EEXIST: gui_fatal("File copy: not overwriting existing file. Clean ~/incoming, and retry copy"); break;
default: gui_fatal("File copy");
}
}
extern int do_unpack(void); extern int do_unpack(void);
int main(int argc, char ** argv) int main(int argc, char ** argv)
@ -76,10 +60,14 @@ int main(int argc, char ** argv)
incoming_dir = argv[2]; incoming_dir = argv[2];
mkdir(incoming_dir, 0700); mkdir(incoming_dir, 0700);
if (chdir(incoming_dir)) if (chdir(incoming_dir)) {
gui_fatal("Error chdir to %s", incoming_dir); fprintf(stderr, "Error chdir to %s", incoming_dir);
if (chroot(incoming_dir)) //impossible exit(1);
gui_fatal("Error chroot to %s", incoming_dir); }
if (chroot(incoming_dir)) {//impossible
fprintf(stderr, "Error chroot to %s", incoming_dir);
exit(1);
}
setuid(uid); setuid(uid);
set_size_limit(bytes_limit, files_limit); set_size_limit(bytes_limit, files_limit);
return do_unpack(); return do_unpack();