mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

tftp-hpa: bug fix on empty file put error

Browse Source 
With the feature that checking the disk filled up, the return value of
function write_behind was checked and used to detect the disk status.
While for empty file, without data being written, this function will
return -1 thus the disk filled up error was miss-raised. Fix it.

Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
zhangxiao
2014-09-04 17:40:17 +08:00
committed by Martin Jansa
parent 01816e4420
commit ed698c4dba
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
+33
View File
@@ -0,0 +1,33 @@
tftp-hpa: bug fix on empty file put error
With the feature that checking the disk filled up, the return value of
function write_behind was checked and used to detect the disk status.
While for empty file, without data being written, this function will
return -1 thus the disk filled up error was miss-raised. Fix it.
Upstream-Status: pending
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
---
tftpd/tftpd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -1692,7 +1692,7 @@ static void tftp_recvfile(const struct f
syslog(LOG_WARNING, "tftpd: write(ack): %m");
goto abort;
}
- if(write_behind(file, pf->f_convert) < 0) {
+ if(write_behind(file, pf->f_convert) < -1) {
nak(ENOSPACE, NULL);
(void)fclose(file);
goto abort;
@@ -1727,7 +1727,7 @@ static void tftp_recvfile(const struct f
goto abort;
}
} while (size == segsize);
- if(write_behind(file, pf->f_convert) < 0) {
+ if(write_behind(file, pf->f_convert) < -1) {
nak(ENOSPACE, NULL);
(void)fclose(file);
goto abort;
meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+1
View File
@@ -25,6 +25,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
file://init \
file://add-error-check-for-disk-filled-up.patch \
file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \
file://tftp-hpa-bug-fix-on-empty-file-put-error.patch \
"
SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"