emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix two segfaults (reported by Horst Kronstorfer)

Browse Source 
- remove dangling file if get fails (spotted and fixed by Jason Schoon)
- shrink it (Bernhard Fischer)
Thanks, all!
   text	   data	    bss	    dec	    hex	filename
   2684	      0	      0	   2684	    a7c	networking/tftp.o.orig
   2748	      0	      0	   2748	    abc	networking/tftp.o.allfixed
   2666	      0	      0	   2666	    a6a	networking/tftp.o.+shrink
This commit is contained in:
Bernhard Reutner-Fischer 2006-06-10 14:15:03 +00:00
parent 3b1936dcf9
commit b25f98a417
1 changed files with 137 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
networking/tftp.c
View File

@ -33,13 +33,22 @@
#include "busybox.h" #include "busybox.h"
//#define CONFIG_FEATURE_TFTP_DEBUG
#define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */ #define TFTP_BLOCKSIZE_DEFAULT 512 /* according to RFC 1350, don't change */
#define TFTP_TIMEOUT 5 /* seconds */ #define TFTP_TIMEOUT 5 /* seconds */
#define TFTP_NUM_RETRIES 5 /* number of retries */
/* RFC2348 says between 8 and 65464 */
#define TFTP_OCTECTS_MIN 8
#define TFTP_OCTECTS_MAX 65464
static const char * const MODE_OCTET = "octet";
#define MODE_OCTET_LEN 6 /* sizeof(MODE_OCTET)*/
static const char * const OPTION_BLOCKSIZE = "blksize";
#define OPTION_BLOCKSIZE_LEN 8 /* sizeof(OPTION_BLOCKSIZE) */
/* opcodes we support */ /* opcodes we support */
#define TFTP_RRQ 1 #define TFTP_RRQ 1
#define TFTP_WRQ 2 #define TFTP_WRQ 2
#define TFTP_DATA 3 #define TFTP_DATA 3
@ -58,13 +67,10 @@ static const char * const tftp_bb_error_msg[] = {
"No such user" "No such user"
}; };
#ifdef CONFIG_FEATURE_TFTP_GET #define tftp_cmd_get ENABLE_FEATURE_TFTP_GET
# define tftp_cmd_get 1
#else #if ENABLE_FEATURE_TFTP_PUT
# define tftp_cmd_get 0 # define tftp_cmd_put (tftp_cmd_get+ENABLE_FEATURE_TFTP_PUT)
#endif
#ifdef CONFIG_FEATURE_TFTP_PUT
# define tftp_cmd_put (tftp_cmd_get+1)
#else #else
# define tftp_cmd_put 0 # define tftp_cmd_put 0
#endif #endif
@ -81,7 +87,7 @@ static int tftp_blocksize_check(int blocksize, int bufsize)
*/ */
if ((bufsize && (blocksize > bufsize)) || if ((bufsize && (blocksize > bufsize)) ||
(blocksize < 8) || (blocksize > 65464)) { (blocksize < TFTP_OCTECTS_MIN) || (blocksize > TFTP_OCTECTS_MAX)) {
bb_error_msg("bad blocksize"); bb_error_msg("bad blocksize");
return 0; return 0;
} }
@ -89,7 +95,7 @@ static int tftp_blocksize_check(int blocksize, int bufsize)
return blocksize; return blocksize;
} }
static char *tftp_option_get(char *buf, int len, char *option) static char *tftp_option_get(char *buf, int len, const char const *option)
{ {
int opt_val = 0; int opt_val = 0;
int opt_found = 0; int opt_found = 0;
@ -113,8 +119,7 @@ static char *tftp_option_get(char *buf, int len, char *option)
if (strcasecmp(buf, option) == 0) { if (strcasecmp(buf, option) == 0) {
opt_found = 1; opt_found = 1;
} }
} } else {
else {
if (opt_found) { if (opt_found) {
return buf; return buf;
} }
@ -133,38 +138,34 @@ static char *tftp_option_get(char *buf, int len, char *option)
#endif #endif
static inline int tftp(const int cmd, const struct hostent *host, static int tftp(const int cmd, const struct hostent *host,
const char *remotefile, int localfd, const unsigned short port, int tftp_bufsize) const char *remotefile, const int localfd,
const unsigned short port, int tftp_bufsize)
{ {
const int cmd_get = cmd & tftp_cmd_get; #define cmd_get cmd & tftp_cmd_get
const int cmd_put = cmd & tftp_cmd_put; #define cmd_put cmd & tftp_cmd_put
const int bb_tftp_num_retries = 5;
struct sockaddr_in sa; struct sockaddr_in sa;
struct sockaddr_in from; struct sockaddr_in from;
struct timeval tv; struct timeval tv;
socklen_t fromlen; socklen_t fromlen;
fd_set rfds; fd_set rfds;
char *cp;
unsigned short tmp;
int socketfd; int socketfd;
int len; int len, itmp;
int opcode = 0; int opcode = 0;
int finished = 0; int finished = 0;
int timeout = bb_tftp_num_retries; int timeout = TFTP_NUM_RETRIES;
unsigned short block_nr = 1; unsigned short block_nr = 1;
unsigned short tmp;
char *cp;
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE USE_FEATURE_TFTP_BLOCKSIZE(int want_option_ack = 0;)
int want_option_ack = 0;
#endif
/* Can't use RESERVE_CONFIG_BUFFER here since the allocation /* Can't use RESERVE_CONFIG_BUFFER here since the allocation
* size varies meaning BUFFERS_GO_ON_STACK would fail */ * size varies meaning BUFFERS_GO_ON_STACK would fail */
char *buf=xmalloc(tftp_bufsize + 4); char *buf=xmalloc(tftp_bufsize += 4);
tftp_bufsize += 4; if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
/* need to unlink the localfile, so don't use bb_xsocket here. */
if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { /* bb_xsocket? */
bb_perror_msg("socket"); bb_perror_msg("socket");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -180,11 +181,9 @@ static inline int tftp(const int cmd, const struct hostent *host,
sizeof(sa.sin_addr)); sizeof(sa.sin_addr));
/* build opcode */ /* build opcode */
if (cmd_get) { if (cmd_get) {
opcode = TFTP_RRQ; opcode = TFTP_RRQ;
} }
if (cmd_put) { if (cmd_put) {
opcode = TFTP_WRQ; opcode = TFTP_WRQ;
} }
@ -194,39 +193,34 @@ static inline int tftp(const int cmd, const struct hostent *host,
cp = buf; cp = buf;
/* first create the opcode part */ /* first create the opcode part */
*((unsigned short *) cp) = htons(opcode); *((unsigned short *) cp) = htons(opcode);
cp += 2; cp += 2;
/* add filename and mode */ /* add filename and mode */
if (((cmd_get) && (opcode == TFTP_RRQ)) ||
if ((cmd_get && (opcode == TFTP_RRQ)) || ((cmd_put) && (opcode == TFTP_WRQ)))
(cmd_put && (opcode == TFTP_WRQ))) { {
int too_long = 0; int too_long = 0;
/* see if the filename fits into buf */ /* see if the filename fits into buf
/* and fill in packet */ * and fill in packet. */
len = strlen(remotefile) + 1; len = strlen(remotefile) + 1;
if ((cp + len) >= &buf[tftp_bufsize - 1]) { if ((cp + len) >= &buf[tftp_bufsize - 1]) {
too_long = 1; too_long = 1;
} } else {
else {
safe_strncpy(cp, remotefile, len); safe_strncpy(cp, remotefile, len);
cp += len; cp += len;
} }
if (too_long || ((&buf[tftp_bufsize - 1] - cp) < 6)) { if (too_long || ((&buf[tftp_bufsize - 1] - cp) < MODE_OCTET_LEN)) {
bb_error_msg("too long remote-filename"); bb_error_msg("remote filename too long");
break; break;
} }
/* add "mode" part of the package */ /* add "mode" part of the package */
memcpy(cp, MODE_OCTET, MODE_OCTET_LEN);
memcpy(cp, "octet", 6); cp += MODE_OCTET_LEN;
cp += 6;
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
@ -235,15 +229,13 @@ static inline int tftp(const int cmd, const struct hostent *host,
if (len != TFTP_BLOCKSIZE_DEFAULT) { if (len != TFTP_BLOCKSIZE_DEFAULT) {
if ((&buf[tftp_bufsize - 1] - cp) < 15) { if ((&buf[tftp_bufsize - 1] - cp) < 15) {
bb_error_msg("too long remote-filename"); bb_error_msg("remote filename too long");
break; break;
} }
/* add "blksize" + number of blocks */ /* add "blksize" + number of blocks */
memcpy(cp, OPTION_BLOCKSIZE, OPTION_BLOCKSIZE_LEN);
memcpy(cp, "blksize", 8); cp += OPTION_BLOCKSIZE_LEN;
cp += 8;
cp += snprintf(cp, 6, "%d", len) + 1; cp += snprintf(cp, 6, "%d", len) + 1;
want_option_ack = 1; want_option_ack = 1;
@ -253,8 +245,8 @@ static inline int tftp(const int cmd, const struct hostent *host,
/* add ack and data */ /* add ack and data */
if ((cmd_get && (opcode == TFTP_ACK)) || if (((cmd_get) && (opcode == TFTP_ACK)) ||
(cmd_put && (opcode == TFTP_DATA))) { ((cmd_put) && (opcode == TFTP_DATA))) {
*((unsigned short *) cp) = htons(block_nr); *((unsigned short *) cp) = htons(block_nr);
@ -262,7 +254,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
block_nr++; block_nr++;
if (cmd_put && (opcode == TFTP_DATA)) { if ((cmd_put) && (opcode == TFTP_DATA)) {
len = bb_full_read(localfd, cp, tftp_bufsize - 4); len = bb_full_read(localfd, cp, tftp_bufsize - 4);
if (len < 0) { if (len < 0) {
@ -282,7 +274,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
/* send packet */ /* send packet */
timeout = bb_tftp_num_retries; /* re-initialize */ timeout = TFTP_NUM_RETRIES; /* re-initialize */
do { do {
len = cp - buf; len = cp - buf;
@ -316,8 +308,8 @@ static inline int tftp(const int cmd, const struct hostent *host,
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(socketfd, &rfds); FD_SET(socketfd, &rfds);
switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) { itmp = select(socketfd + 1, &rfds, NULL, NULL, &tv);
case 1: if (itmp == 1) {
len = recvfrom(socketfd, buf, tftp_bufsize, 0, len = recvfrom(socketfd, buf, tftp_bufsize, 0,
(struct sockaddr *) &from, &fromlen); (struct sockaddr *) &from, &fromlen);
@ -337,9 +329,9 @@ static inline int tftp(const int cmd, const struct hostent *host,
/* fall-through for bad packets! */ /* fall-through for bad packets! */
/* discard the packet - treat as timeout */ /* discard the packet - treat as timeout */
timeout = bb_tftp_num_retries; timeout = TFTP_NUM_RETRIES;
case 0: } else if (itmp == 0) {
bb_error_msg("timeout"); bb_error_msg("timeout");
timeout--; timeout--;
@ -349,7 +341,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
} }
break; break;
default: } else {
bb_perror_msg("select"); bb_perror_msg("select");
len = -1; len = -1;
} }
@ -362,7 +354,6 @@ static inline int tftp(const int cmd, const struct hostent *host,
/* process received packet */ /* process received packet */
opcode = ntohs(*((unsigned short *) buf)); opcode = ntohs(*((unsigned short *) buf));
tmp = ntohs(*((unsigned short *) &buf[2])); tmp = ntohs(*((unsigned short *) &buf[2]));
@ -388,7 +379,6 @@ static inline int tftp(const int cmd, const struct hostent *host,
break; break;
} }
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
if (want_option_ack) { if (want_option_ack) {
@ -400,23 +390,21 @@ static inline int tftp(const int cmd, const struct hostent *host,
char *res; char *res;
res = tftp_option_get(&buf[2], len-2, res = tftp_option_get(&buf[2], len - 2, OPTION_BLOCKSIZE);
"blksize");
if (res) { if (res) {
int blksize = atoi(res); int blksize = atoi(res);
if (tftp_blocksize_check(blksize, if (tftp_blocksize_check(blksize, tftp_bufsize - 4)) {
tftp_bufsize - 4)) {
if (cmd_put) { if (cmd_put) {
opcode = TFTP_DATA; opcode = TFTP_DATA;
} } else {
else {
opcode = TFTP_ACK; opcode = TFTP_ACK;
} }
#ifdef CONFIG_FEATURE_TFTP_DEBUG #ifdef CONFIG_FEATURE_TFTP_DEBUG
fprintf(stderr, "using blksize %u\n", blksize); fprintf(stderr, "using %s %u\n", OPTION_BLOCKSIZE,
blksize);
#endif #endif
tftp_bufsize = blksize + 4; tftp_bufsize = blksize + 4;
block_nr = 0; block_nr = 0;
@ -436,7 +424,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
} }
#endif #endif
if (cmd_get && (opcode == TFTP_DATA)) { if ((cmd_get) && (opcode == TFTP_DATA)) {
if (tmp == block_nr) { if (tmp == block_nr) {
@ -467,7 +455,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
} }
} }
if (cmd_put && (opcode == TFTP_ACK)) { if ((cmd_put) && (opcode == TFTP_ACK)) {
if (tmp == (unsigned short) (block_nr - 1)) { if (tmp == (unsigned short) (block_nr - 1)) {
if (finished) { if (finished) {
@ -482,7 +470,6 @@ static inline int tftp(const int cmd, const struct hostent *host,
#ifdef CONFIG_FEATURE_CLEAN_UP #ifdef CONFIG_FEATURE_CLEAN_UP
close(socketfd); close(socketfd);
free(buf); free(buf);
#endif #endif
@ -505,6 +492,7 @@ int tftp_main(int argc, char **argv)
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
char *sblocksize = NULL; char *sblocksize = NULL;
#define BS "b:" #define BS "b:"
#define BS_ARG , &sblocksize #define BS_ARG , &sblocksize
#else #else
@ -533,20 +521,12 @@ int tftp_main(int argc, char **argv)
#elif defined(CONFIG_FEATURE_TFTP_GET) || defined(CONFIG_FEATURE_TFTP_PUT) #elif defined(CONFIG_FEATURE_TFTP_GET) || defined(CONFIG_FEATURE_TFTP_PUT)
bb_opt_complementally = GET_COMPL PUT_COMPL; bb_opt_complementally = GET_COMPL PUT_COMPL;
#else #else
/* XXX: may be should #error ? */ #error "Either CONFIG_FEATURE_TFTP_GET or CONFIG_FEATURE_TFTP_PUT must be defined"
#endif #endif
cmd = bb_getopt_ulflags(argc, argv, GET PUT "l:r:" BS, cmd = bb_getopt_ulflags(argc, argv, GET PUT "l:r:" BS,
&localfile, &remotefile BS_ARG); &localfile, &remotefile BS_ARG);
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
if(sblocksize) {
blocksize = atoi(sblocksize);
if (!tftp_blocksize_check(blocksize, 0)) {
return EXIT_FAILURE;
}
}
#endif
cmd &= (tftp_cmd_get | tftp_cmd_put); cmd &= (tftp_cmd_get | tftp_cmd_put);
#ifdef CONFIG_FEATURE_TFTP_GET #ifdef CONFIG_FEATURE_TFTP_GET
@ -558,21 +538,31 @@ int tftp_main(int argc, char **argv)
flags = O_RDONLY; flags = O_RDONLY;
#endif #endif
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
if (sblocksize) {
blocksize = atoi(sblocksize);
if (!tftp_blocksize_check(blocksize, 0)) {
return EXIT_FAILURE;
}
}
#endif
if (localfile == NULL) if (localfile == NULL)
localfile = remotefile; localfile = remotefile;
if (remotefile == NULL) if (remotefile == NULL)
remotefile = localfile; remotefile = localfile;
/* XXX: I corrected this, but may be wrong too. vodz */ if ((localfile == NULL && remotefile == NULL) || (argv[optind] == NULL))
bb_show_usage();
if (localfile == NULL || strcmp(localfile, "-") == 0) { if (localfile == NULL || strcmp(localfile, "-") == 0) {
fd = fileno((cmd==tftp_cmd_get)? stdout : stdin); fd = (cmd == tftp_cmd_get) ? STDOUT_FILENO : STDIN_FILENO;
} else if (fd==-1) { } else {
fd = open(localfile, flags, 0644); fd = open(localfile, flags, 0644); /* fail below */
} }
if (fd < 0) { if (fd < 0) {
bb_perror_msg_and_die("local file"); bb_perror_msg_and_die("local file");
} }
/* XXX: argv[optind] and/or argv[optind + 1] may be NULL! */
host = xgethostbyname(argv[optind]); host = xgethostbyname(argv[optind]);
port = bb_lookup_port(argv[optind + 1], "udp", 69); port = bb_lookup_port(argv[optind + 1], "udp", 69);
@ -590,5 +580,7 @@ int tftp_main(int argc, char **argv)
close(fd); close(fd);
} }
#endif #endif
if (cmd == tftp_cmd_get && result != EXIT_SUCCESS)
unlink(localfile);
return (result); return (result);
} }