aboutsummaryrefslogtreecommitdiff
path: root/slirp/tftp.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-02-20 00:12:07 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-02-20 00:12:07 +0000
commit0db1137dbf5008d456b9cc80a5cf1222467fed9d (patch)
treefff16b11c6aaac079c8c88878c80591f658c722a /slirp/tftp.c
parent1f697db9c3c22d3768175dbd70e7d5a68638e7b7 (diff)
downloadqemu-0db1137dbf5008d456b9cc80a5cf1222467fed9d.zip
qemu-0db1137dbf5008d456b9cc80a5cf1222467fed9d.tar.gz
qemu-0db1137dbf5008d456b9cc80a5cf1222467fed9d.tar.bz2
Change -tftp option to take a root directory, by Anthony Liguori.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2441 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'slirp/tftp.c')
-rw-r--r--slirp/tftp.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/slirp/tftp.c b/slirp/tftp.c
index b3947eb..96d00e6 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -102,8 +102,15 @@ static int tftp_read_data(struct tftp_session *spt, u_int16_t block_nr,
{
int fd;
int bytes_read = 0;
+ char buffer[1024];
+ int n;
- fd = open(spt->filename, O_RDONLY | O_BINARY);
+ n = snprintf(buffer, sizeof(buffer), "%s/%s",
+ tftp_prefix, spt->filename);
+ if (n >= sizeof(buffer))
+ return -1;
+
+ fd = open(buffer, O_RDONLY | O_BINARY);
if (fd < 0) {
return -1;
@@ -325,8 +332,7 @@ static void tftp_handle_rrq(struct tftp_t *tp, int pktlen)
/* only allow exported prefixes */
- if (!tftp_prefix
- || (strncmp(spt->filename, tftp_prefix, strlen(tftp_prefix)) != 0)) {
+ if (!tftp_prefix) {
tftp_send_error(spt, 2, "Access violation", tp);
return;
}