sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

fs: tftp: Fix writing files to tftp 

Copying files to tftp is broken since:

| commit d4f5bb1e01
| Author: Sascha Hauer <s.hauer@pengutronix.de>
| Date:   Sat Sep 28 13:12:50 2013 +0200
|
|     copy_file: Add missing O_TRUNC
|
|     Without it, when copying a smaller file over a larger file the
|     resulting file still has the remaining space from the larger file.
|
|     Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Since this commit copy_file passes O_TRUNC to open(). This results in the
fs layer calling fsdrv->truncate. tftp returns -ENOSYS here and open returns
with an error. To fix this return 0 for the truncate callback in tftp. Also
enforce the O_TRUNC flag when opening a file for writing on tftp as the files
are always truncated on tftp anyway.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reported-by: andreas.willig@rafi.de
This commit is contained in:
Sascha Hauer 2014-02-26 09:02:15 +01:00
parent 3df00bd62d
commit 0b1d85af18
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/tftp.c
View File

@ -110,7 +110,7 @@ static int tftp_rmdir(struct device_d *dev, const char *pathname)
static int tftp_truncate(struct device_d *dev, FILE *f, ulong size)
{
return -ENOSYS;
return 0;
}
static int tftp_send(struct file_priv *priv)
@ -393,6 +393,14 @@ static struct file_priv *tftp_do_open(struct device_d *dev,
case O_WRONLY:
priv->push = 1;
priv->state = STATE_WRQ;
if (!(accmode & O_TRUNC)) {
/*
* TFTP always truncates the existing file, so this
* flag is mandatory when opening a file for writing.
*/
ret = -ENOSYS;
goto out;
}
break;
case O_RDWR:
ret = -ENOSYS;