forked from pool/atftp
Marcus Meissner
f048de6c7b
- added rules for SuSEfirewall2 (bnc#729793) - use the "su" logrotate directive (bnc#677335) - prevent the sorcerer's apprentice syndrome situation only when explicitly specified by the user (bnc#774376) (added a new command line option --prevent-sas to turn it on) - fix a race condition where two server threads pick up a single client, which causes the transported file being overwritten (bnc#599856) OBS-URL: https://build.opensuse.org/request/show/133636 OBS-URL: https://build.opensuse.org/package/show/network/atftp?expand=0&rev=16
103 lines
4.1 KiB
Diff
103 lines
4.1 KiB
Diff
Index: tftpd_file.c
|
|
===================================================================
|
|
--- tftpd_file.c.orig 2012-08-06 10:26:36.356745154 +0200
|
|
+++ tftpd_file.c 2012-08-06 11:27:59.265571512 +0200
|
|
@@ -113,7 +113,7 @@ int tftpd_receive_file(struct thread_dat
|
|
struct sockaddr_in *sa = &data->client_info->client;
|
|
struct sockaddr_in from;
|
|
struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer;
|
|
- FILE *fp;
|
|
+ FILE *fp = NULL;
|
|
char filename[MAXLEN];
|
|
char string[MAXLEN];
|
|
int timeout = data->timeout;
|
|
@@ -143,18 +143,6 @@ int tftpd_receive_file(struct thread_dat
|
|
return ERR;
|
|
}
|
|
|
|
- /* Open the file for writing. */
|
|
- if ((fp = fopen(filename, "w")) == NULL)
|
|
- {
|
|
- /* Can't create the file. */
|
|
- logger(LOG_INFO, "Can't open %s for writing", filename);
|
|
- tftp_send_error(sockfd, sa, EACCESS, data->data_buffer, data->data_buffer_size);
|
|
- if (data->trace)
|
|
- logger(LOG_DEBUG, "sent ERROR <code: %d, msg: %s>", EACCESS,
|
|
- tftp_errmsg[EACCESS]);
|
|
- return ERR;
|
|
- }
|
|
-
|
|
/* tsize option */
|
|
if (((result = opt_get_tsize(data->tftp_options)) > -1) && !convert)
|
|
{
|
|
@@ -171,7 +159,6 @@ int tftpd_receive_file(struct thread_dat
|
|
if (data->trace)
|
|
logger(LOG_DEBUG, "sent ERROR <code: %d, msg: %s>", EOPTNEG,
|
|
tftp_errmsg[EOPTNEG]);
|
|
- fclose(fp);
|
|
return ERR;
|
|
}
|
|
timeout = result;
|
|
@@ -188,7 +175,6 @@ int tftpd_receive_file(struct thread_dat
|
|
if (data->trace)
|
|
logger(LOG_DEBUG, "sent ERROR <code: %d, msg: %s>", EOPTNEG,
|
|
tftp_errmsg[EOPTNEG]);
|
|
- fclose(fp);
|
|
return ERR;
|
|
}
|
|
|
|
@@ -198,7 +184,6 @@ int tftpd_receive_file(struct thread_dat
|
|
if (data->data_buffer == NULL)
|
|
{
|
|
logger(LOG_ERR, "memory allocation failure");
|
|
- fclose(fp);
|
|
return ERR;
|
|
}
|
|
tftphdr = (struct tftphdr *)data->data_buffer;
|
|
@@ -209,7 +194,6 @@ int tftpd_receive_file(struct thread_dat
|
|
if (data->trace)
|
|
logger(LOG_DEBUG, "sent ERROR <code: %d, msg: %s>", ENOSPACE,
|
|
tftp_errmsg[ENOSPACE]);
|
|
- fclose(fp);
|
|
return ERR;
|
|
}
|
|
opt_set_blksize(result, data->tftp_options);
|
|
@@ -342,6 +326,20 @@ int tftpd_receive_file(struct thread_dat
|
|
}
|
|
break;
|
|
case S_DATA_RECEIVED:
|
|
+ if (fp == NULL) {
|
|
+ /* Open the file for writing. */
|
|
+ if ((fp = fopen(filename, "w")) == NULL)
|
|
+ {
|
|
+ /* Can't create the file. */
|
|
+ logger(LOG_INFO, "Can't open %s for writing", filename);
|
|
+ tftp_send_error(sockfd, sa, EACCESS, data->data_buffer, data->data_buffer_size);
|
|
+ if (data->trace)
|
|
+ logger(LOG_DEBUG, "sent ERROR <code: %d, msg: %s>", EACCESS,
|
|
+ tftp_errmsg[EACCESS]);
|
|
+ return ERR;
|
|
+ }
|
|
+ }
|
|
+
|
|
/* We need to seek to the right place in the file */
|
|
block_number = ntohs(tftphdr->th_block);
|
|
if (data->trace)
|
|
@@ -369,13 +367,13 @@ int tftpd_receive_file(struct thread_dat
|
|
state = S_SEND_ACK;
|
|
break;
|
|
case S_END:
|
|
- fclose(fp);
|
|
+ if (fp != NULL) fclose(fp);
|
|
return OK;
|
|
case S_ABORT:
|
|
- fclose(fp);
|
|
+ if (fp != NULL) fclose(fp);
|
|
return ERR;
|
|
default:
|
|
- fclose(fp);
|
|
+ if (fp != NULL) fclose(fp);
|
|
logger(LOG_ERR, "%s: %d: tftpd_file.c: huh?",
|
|
__FILE__, __LINE__);
|
|
return ERR;
|