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

dvm: graceful exit from add_pendrive on error

Browse Source 
If something goes wrong, tell qfileexchgd to kill us, instead of
plain exiting. Works with dropped privs, and lets qfileexchgd
use dvm-debug switch to delay dvm kill.
This commit is contained in:
Rafal Wojtczuk 2010-06-30 17:58:07 +02:00 committed by Joanna Rutkowska
parent 0c122f670e
commit 2991f20d6b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
appvm/qubes_add_pendrive_script.c
View File

@ -84,13 +84,14 @@ void background()
} }
} }
void check_legal_filename(char *name) int check_legal_filename(char *name)
{ {
if (index(name, '/')) { if (index(name, '/')) {
syslog(LOG_DAEMON | LOG_ERR, syslog(LOG_DAEMON | LOG_ERR,
"the received filename contains /"); "the received filename contains /");
exit(1); return 0;
} }
return 1;
} }
void drop_to_user() void drop_to_user()
@ -135,6 +136,13 @@ void redirect_stderr()
dup2(fd, 2); dup2(fd, 2);
} }
void suicide(struct xs_handle *xs)
{
xs_write(xs, XBT_NULL, "device/qpen", "killme", 6);
xs_daemon_close(xs);
exit(1);
}
void dvm_transaction_request(char *seq, struct xs_handle *xs) void dvm_transaction_request(char *seq, struct xs_handle *xs)
{ {
char filename[1024], cmdbuf[1024]; char filename[1024], cmdbuf[1024];
@ -145,21 +153,22 @@ void dvm_transaction_request(char *seq, struct xs_handle *xs)
xvdh_fd = open("/dev/xvdh", O_RDONLY); xvdh_fd = open("/dev/xvdh", O_RDONLY);
if (read(xvdh_fd, &header, sizeof(header)) != sizeof(header)) { if (read(xvdh_fd, &header, sizeof(header)) != sizeof(header)) {
syslog(LOG_DAEMON | LOG_ERR, "read dvm_header"); syslog(LOG_DAEMON | LOG_ERR, "read dvm_header");
exit(1); suicide(xs);
} }
header.name[sizeof(header.name) - 1] = 0; header.name[sizeof(header.name) - 1] = 0;
check_legal_filename(header.name); if (!check_legal_filename(header.name))
suicide(xs);
snprintf(filename, sizeof(filename), "/tmp/%s", header.name); snprintf(filename, sizeof(filename), "/tmp/%s", header.name);
drop_to_user(); drop_to_user();
file_fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600); file_fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
if (file_fd < 0) { if (file_fd < 0) {
syslog(LOG_DAEMON | LOG_ERR, "open file"); syslog(LOG_DAEMON | LOG_ERR, "open file");
exit(1); suicide(xs);
} }
if (!copy_from_xvdh(file_fd, xvdh_fd, header.file_size)) if (!copy_from_xvdh(file_fd, xvdh_fd, header.file_size))
exit(1); suicide(xs);
close(xvdh_fd); close(xvdh_fd);
close(file_fd); close(file_fd);
snprintf(cmdbuf, sizeof(cmdbuf), snprintf(cmdbuf, sizeof(cmdbuf),
@ -172,7 +181,7 @@ void dvm_transaction_request(char *seq, struct xs_handle *xs)
execl("/usr/bin/qvm-dvm-transfer", "qvm-dvm-transfer", src_vm, execl("/usr/bin/qvm-dvm-transfer", "qvm-dvm-transfer", src_vm,
filename, seq, NULL); filename, seq, NULL);
syslog(LOG_DAEMON | LOG_ERR, "execl qvm-dvm-transfer"); syslog(LOG_DAEMON | LOG_ERR, "execl qvm-dvm-transfer");
exit(1); suicide(xs);
} }
void dvm_transaction_return(char *seq_string, struct xs_handle *xs) void dvm_transaction_return(char *seq_string, struct xs_handle *xs)