patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: tftp: Ensure the error message fits into transmit buffer

Browse source 
Make sure that the error message does not overflow the transmit buffer
when copying the error message string.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2023-11-17 12:53:38 +01:00 committed by Carles Cufí
parent 59544d58ef
commit f0247131bf
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subsys/net/lib/tftp/tftp_client.c
View file

@ -155,8 +155,14 @@ static inline int send_err(int sock, struct tftpc *client, int err_code, char *e
/* Copy the Error String. */
if (err_msg != NULL) {
strcpy(client->tftp_buf + req_size, err_msg);
req_size += strlen(err_msg);
size_t copy_len = strlen(err_msg);
if (copy_len > sizeof(client->tftp_buf) - req_size) {
copy_len = sizeof(client->tftp_buf) - req_size;
}
memcpy(client->tftp_buf + req_size, err_msg, copy_len);
req_size += copy_len;
}
/* Send Error to server. */