mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: tftp: Cleanup tftp_prefix check

Browse Source 
Perform check for set prefix early (if it's not given, tftp is disabled)
and drop redundant second check.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-06-24 14:42:29 +02:00 committed by Anthony Liguori
parent ee9be58735
commit f8e3cbd3b5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slirp/tftp.c
View File

@ -287,6 +287,12 @@ static void tftp_handle_rrq(struct tftp_t *tp, int pktlen)
spt = &tftp_sessions[s]; spt = &tftp_sessions[s];
/* unspecifed prefix means service disabled */
if (!tftp_prefix) {
tftp_send_error(spt, 2, "Access violation", tp);
return;
}
src = tp->x.tp_buf; src = tp->x.tp_buf;
dst = spt->filename; dst = spt->filename;
n = pktlen - ((uint8_t *)&tp->x.tp_buf[0] - (uint8_t *)tp); n = pktlen - ((uint8_t *)&tp->x.tp_buf[0] - (uint8_t *)tp);
@ -333,13 +339,6 @@ static void tftp_handle_rrq(struct tftp_t *tp, int pktlen)
return; return;
} }
/* only allow exported prefixes */
if (!tftp_prefix) {
tftp_send_error(spt, 2, "Access violation", tp);
return;
}
/* check if the file exists */ /* check if the file exists */
if (tftp_read_data(spt, 0, spt->filename, 0) < 0) { if (tftp_read_data(spt, 0, spt->filename, 0) < 0) {
@ -370,7 +369,7 @@ static void tftp_handle_rrq(struct tftp_t *tp, int pktlen)
int tsize = atoi(value); int tsize = atoi(value);
struct stat stat_p; struct stat stat_p;
if (tsize == 0 && tftp_prefix) { if (tsize == 0) {
char buffer[1024]; char buffer[1024];
int len; int len;