mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-29 05:40:35 +00:00
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. Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
01816e4420
commit
ed698c4dba
@ -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;
|
||||||
@ -25,6 +25,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
|
|||||||
file://init \
|
file://init \
|
||||||
file://add-error-check-for-disk-filled-up.patch \
|
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-separated-CR-and-LF.patch \
|
||||||
|
file://tftp-hpa-bug-fix-on-empty-file-put-error.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"
|
SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user