riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11773 from miri64/gnrc_tftp/fix/uninitialized-values

Browse Source 
gnrc_tftp: initialize unititialized 'tftp_context_t'
This commit is contained in:
Martine Lenders 2019-07-03 14:52:46 +02:00 committed by GitHub
commit e8650f5b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/include/net/gnrc/tftp.h
View File

@ -15,6 +15,9 @@
* @file * @file
* @brief TFTP support library * @brief TFTP support library
* *
* @warning Currently only runs with link-local addresses when there is only
* one interface
*
* The TFTP module add's support for the TFTP protocol. * The TFTP module add's support for the TFTP protocol.
* It implements the following RFC's: * It implements the following RFC's:
* - https://tools.ietf.org/html/rfc1350 * - https://tools.ietf.org/html/rfc1350
@ -162,6 +165,8 @@ int gnrc_tftp_server_stop(void);
/** /**
* @brief Start an TFTP client read action from the given destination * @brief Start an TFTP client read action from the given destination
* *
* @pre `(GNRC_NETIF_NUMOF == 1) || !ipv6_addr_is_link_local(addr)`
*
* @param [in] addr the address of the server * @param [in] addr the address of the server
* @param [in] file_name the filename of the file to get * @param [in] file_name the filename of the file to get
* @param [in] mode the transfer mode * @param [in] mode the transfer mode
@ -180,6 +185,8 @@ int gnrc_tftp_client_read(ipv6_addr_t *addr, const char *file_name, tftp_mode_t
/** /**
* @brief Start an TFTP client write action to the given destination * @brief Start an TFTP client write action to the given destination
* *
* @pre `(GNRC_NETIF_NUMOF == 1) || !ipv6_addr_is_link_local(addr)`
*
* @param [in] addr the address of the server * @param [in] addr the address of the server
* @param [in] file_name the filename of the file to write * @param [in] file_name the filename of the file to write
* @param [in] mode the transfer mode * @param [in] mode the transfer mode

36
sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
View File

@ -36,6 +36,12 @@
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#if (GNRC_NETIF_NUMOF > 1)
/* TODO: change API to make link-local address communitcation with
* multiple network interfaces */
#warning "gnrc_tftp does not work reliably with link-local addresses and >1 network interfaces."
#endif
static kernel_pid_t _tftp_kernel_pid; static kernel_pid_t _tftp_kernel_pid;
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
@ -405,11 +411,13 @@ int gnrc_tftp_server(tftp_data_cb_t data_cb, tftp_start_cb_t start_cb, tftp_stop
} }
/* context will be initialized when a connection is established */ /* context will be initialized when a connection is established */
tftp_context_t ctxt; tftp_context_t ctxt = {
ctxt.data_cb = data_cb; .src_port = GNRC_TFTP_DEFAULT_DST_PORT,
ctxt.start_cb = start_cb; .data_cb = data_cb,
ctxt.stop_cb = stop_cb; .start_cb = start_cb,
ctxt.enable_options = use_options; .stop_cb = stop_cb,
.enable_options = use_options,
};
/* validate our arguments */ /* validate our arguments */
assert(data_cb); assert(data_cb);
@ -700,6 +708,8 @@ tftp_state _tftp_state_processes(tftp_context_t *ctxt, msg_t *m)
if (proc == TS_DUP) { if (proc == TS_DUP) {
DEBUG("tftp: duplicated data received, acking...\n"); DEBUG("tftp: duplicated data received, acking...\n");
ctxt->dst_port = byteorder_ntohs(udp->src_port);
DEBUG("tftp: client's port is %" PRIu16 "\n", ctxt->dst_port);
_tftp_send_dack(ctxt, outbuf, TO_ACK); _tftp_send_dack(ctxt, outbuf, TO_ACK);
return TS_BUSY; return TS_BUSY;
} }
@ -991,6 +1001,22 @@ tftp_state _tftp_send(gnrc_pktsnip_t *buf, tftp_context_t *ctxt, size_t len)
return TS_FAILED; return TS_FAILED;
} }
if (ipv6_addr_is_link_local(&(ctxt->peer))) {
gnrc_pktsnip_t *netif_hdr = gnrc_netif_hdr_build(NULL, 0, NULL, 0);
if (netif_hdr == NULL) {
DEBUG("tftp: error unable to allocate IPv6 header\n");
gnrc_pktbuf_release(ip);
if (ctxt->stop_cb) {
ctxt->stop_cb(TFTP_INTERN_ERROR, "no netif_hdr allocate");
}
return TS_FAILED;
}
((gnrc_netif_hdr_t *)netif_hdr->data)->if_pid = gnrc_netif_iter(NULL)->pid;
LL_PREPEND(ip, netif_hdr);
}
/* send packet */ /* send packet */
if (gnrc_netapi_dispatch_send(GNRC_NETTYPE_UDP, GNRC_NETREG_DEMUX_CTX_ALL, if (gnrc_netapi_dispatch_send(GNRC_NETTYPE_UDP, GNRC_NETREG_DEMUX_CTX_ALL,
ip) == 0) { ip) == 0) {