This is an automated email from the ASF dual-hosted git repository. GUIDINGLI pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 2cc70cb52f5abc3e147bfe1874a8874e55d584bf Author: shenjunyuan <[email protected]> AuthorDate: Wed Oct 28 21:24:56 2026 +0800 drivers/mtd/filemtd: report I/O errors of the backing file filemtd ignored the result of file_seek/file_read/file_write: bread, bwrite, byteread, bytewrite and erase always reported success, and filemtd_write() returned 0 because it counted len down to zero. A failing backing file therefore looked like working flash, and a file system on top went on with stale or unwritten data. Access the backing file with file_pread()/file_pwrite(), propagate every error, report short transfers as -EIO, and return the number of bytes written from filemtd_write(). Signed-off-by: shenjunyuan <[email protected]> Signed-off-by: jingfei <[email protected]> --- drivers/mtd/filemtd.c | 67 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c index 6e3f3bb16c1..137b3c51115 100644 --- a/drivers/mtd/filemtd.c +++ b/drivers/mtd/filemtd.c @@ -195,6 +195,8 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset, uint8_t srcvalue; uint8_t newvalue; size_t seekpos; + size_t total = len; + ssize_t ret; /* Set the starting location in the file */ @@ -206,8 +208,8 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset, { /* Read more data from the file */ - file_seek(&priv->mtdfile, seekpos, SEEK_SET); - buflen = file_read(&priv->mtdfile, buf, MIN(len, sizeof(buf))); + buflen = file_pread(&priv->mtdfile, buf, MIN(len, sizeof(buf)), + seekpos); /* A negative errno or EOF must not reach the guards below, * which would let pout run past buf[] and corrupt the stack. @@ -260,8 +262,12 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset, if (remain == 0) { - file_seek(&priv->mtdfile, seekpos, SEEK_SET); - file_write(&priv->mtdfile, buf, buflen); + ret = file_pwrite(&priv->mtdfile, buf, buflen, seekpos); + if (ret != buflen) + { + return ret < 0 ? ret : -EIO; + } + seekpos += buflen; buflen = 0; } @@ -271,11 +277,14 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset, if (buflen != 0) { - file_seek(&priv->mtdfile, seekpos, SEEK_SET); - file_write(&priv->mtdfile, buf, buflen); + ret = file_pwrite(&priv->mtdfile, buf, buflen, seekpos); + if (ret != buflen) + { + return ret < 0 ? ret : -EIO; + } } - return len; + return total; } /**************************************************************************** @@ -286,11 +295,18 @@ static ssize_t filemtd_read(FAR struct file_dev_s *priv, FAR unsigned char *buffer, size_t offsetbytes, unsigned int nbytes) { - /* Set the starting location in the file */ + ssize_t ret; + + ret = file_pread(&priv->mtdfile, buffer, nbytes, + priv->offset + offsetbytes); + if (ret >= 0 && ret != nbytes) + { + /* The file is sized to the whole device, a short read is an error */ - file_seek(&priv->mtdfile, priv->offset + offsetbytes, SEEK_SET); + ret = -EIO; + } - return file_read(&priv->mtdfile, buffer, nbytes); + return ret; } /**************************************************************************** @@ -328,12 +344,21 @@ static int filemtd_erase(FAR struct mtd_dev_s *dev, off_t startblock, /* Then erase the data in the file */ - file_seek(&priv->mtdfile, priv->offset + offset, SEEK_SET); memset(buffer, CONFIG_FILEMTD_ERASESTATE, sizeof(buffer)); + offset += priv->offset; while (nbytes > 0) { - file_write(&priv->mtdfile, buffer, MIN(nbytes, sizeof(buffer))); - nbytes -= MIN(nbytes, sizeof(buffer)); + size_t len = MIN(nbytes, sizeof(buffer)); + ssize_t ret; + + ret = file_pwrite(&priv->mtdfile, buffer, len, offset); + if (ret != len) + { + return ret < 0 ? ret : -EIO; + } + + offset += len; + nbytes -= len; } return nblocks; @@ -350,6 +375,7 @@ static ssize_t filemtd_bread(FAR struct mtd_dev_s *dev, off_t startblock, off_t offset; off_t maxblock; size_t nbytes; + ssize_t ret; DEBUGASSERT(dev && buf); @@ -375,8 +401,8 @@ static ssize_t filemtd_bread(FAR struct mtd_dev_s *dev, off_t startblock, /* Then read the data from the file */ - filemtd_read(priv, buf, offset, nbytes); - return nblocks; + ret = filemtd_read(priv, buf, offset, nbytes); + return ret < 0 ? ret : nblocks; } /**************************************************************************** @@ -390,6 +416,7 @@ static ssize_t filemtd_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, off_t offset; off_t maxblock; size_t nbytes; + ssize_t ret; DEBUGASSERT(dev && buf); @@ -415,8 +442,8 @@ static ssize_t filemtd_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, /* Then write the data to the file */ - filemtd_write(priv, offset, buf, nbytes); - return nblocks; + ret = filemtd_write(priv, offset, buf, nbytes); + return ret < 0 ? ret : nblocks; } /**************************************************************************** @@ -444,8 +471,7 @@ static ssize_t filemtd_byteread(FAR struct mtd_dev_s *dev, off_t offset, nbytes = maxoffset - offset; } - filemtd_read(priv, buf, offset, nbytes); - return nbytes; + return filemtd_read(priv, buf, offset, nbytes); } /**************************************************************************** @@ -476,8 +502,7 @@ static ssize_t file_bytewrite(FAR struct mtd_dev_s *dev, off_t offset, /* Then write the data to the file */ - filemtd_write(priv, offset, buf, nbytes); - return nbytes; + return filemtd_write(priv, offset, buf, nbytes); } #endif
