phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Add some missing error handling to NXFFS 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4068 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-10-29 16:30:29 +00:00
parent 2c4adc2194
commit 0977d3ef5f
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nuttx/ChangeLog
View File

@ -2178,3 +2178,8 @@
not being recognized and handled properly.
* graphics/nxsu/nx_releasebkgdg.c: Fix a bad cast that was causing
problems with the backgournd window was released.
* fs/nxffs/nxffs_pack.c: Correct a critical bug in the NXFFS file system:
When repacking the filesystem, there was a missing check to see if an
inode structure would fit at the end of a block. This is a rare case
if the block size is large, but can be common for tiny block sizes
and results in a crash and file system corruption.

49
nuttx/fs/nxffs/nxffs_pack.c
View File

@ -1433,34 +1433,45 @@ int nxffs_pack(FAR struct nxffs_volume_s *volume)
}
/* If all of the "normal" inodes have been packed, then check if
* we need to the current, in-progress write operation.
* we need to pack the current, in-progress write operation.
*/
if (wrfile)
{
DEBUGASSERT(packed == true);
/* Pack write data into this block */
/* Make sure there is space at this location for an inode header */
ret = nxffs_packwriter(volume, &pack, wrfile);
if (ret < 0)
{
/* The error -ENOSPC is a special value that simply
* means that there is nothing further to be packed.
*/
if (pack.iooffset + SIZEOF_NXFFS_INODE_HDR > volume->geo.blocksize)
{
/* No.. not enough space here. Skip the rest of this block */
if (ret == -ENOSPC)
{
wrfile = NULL;
}
else
{
/* Otherwise, something really bad happened */
pack.iooffset = SIZEOF_NXFFS_BLOCK_HDR;
}
else
{
/* Pack write data into this block */
fdbg("Failed to pack into block %d: %d\n",
block, ret);
goto errout_with_pack;
}
ret = nxffs_packwriter(volume, &pack, wrfile);
if (ret < 0)
{
/* The error -ENOSPC is a special value that simply
* means that there is nothing further to be packed.
*/
if (ret == -ENOSPC)
{
wrfile = NULL;
}
else
{
/* Otherwise, something really bad happened */
fdbg("Failed to pack into block %d: %d\n",
block, ret);
goto errout_with_pack;
}
}
}
}
}