mirror of
https://git.yoctoproject.org/poky
synced 2026-02-23 01:49:40 +01:00
5f1bfba262
When the code is compiled with "-fstack-protector-strong -D_FORTIFY_SOURCE=2", everytime ftpfd is asked for a non existent file, it crashes with the following error: *** buffer overflow detected ***: Aborted This seems to be a bug/feature of gcc. A bug has been open on their bugzilla, and also inetutils have been posted with the proposed patch. Without this patch, pxelinux fails to boot because it keeps asking the server for the pxelinux.cfg/00-01-02-03-04 and never jumps to /default. (From OE-Core rev: 0c3a1251a8aec86f3e877130f926a928e5ca2030) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
26 lines
875 B
Diff
26 lines
875 B
Diff
tftpd: Fix abort on error path
|
|
|
|
When trying to fetch a non existent file, the app crashes with:
|
|
|
|
*** buffer overflow detected ***:
|
|
Aborted
|
|
|
|
|
|
Upstream-Status: Submitted [https://www.mail-archive.com/bug-inetutils@gnu.org/msg03036.html https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91205]
|
|
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
|
|
diff --git a/src/tftpd.c b/src/tftpd.c
|
|
index 56002a0..144012f 100644
|
|
--- a/src/tftpd.c
|
|
+++ b/src/tftpd.c
|
|
@@ -864,9 +864,8 @@ nak (int error)
|
|
pe->e_msg = strerror (error - 100);
|
|
tp->th_code = EUNDEF; /* set 'undef' errorcode */
|
|
}
|
|
- strcpy (tp->th_msg, pe->e_msg);
|
|
length = strlen (pe->e_msg);
|
|
- tp->th_msg[length] = '\0';
|
|
+ memcpy(tp->th_msg, pe->e_msg, length + 1);
|
|
length += 5;
|
|
if (sendto (peer, buf, length, 0, (struct sockaddr *) &from, fromlen) != length)
|
|
syslog (LOG_ERR, "nak: %m\n");
|