sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs_rammap:Check last fileseek restore fpos

Browse Source 
Summary:
  When restoring rammap fpos, we check the return value to avoid potential problems caused by no error return if the restore fails.

Signed-off-by: chenrun1 <chenrun1@xiaomi.com>
This commit is contained in:
chenrun1 2024-07-04 17:45:49 +08:00 committed by Mateusz Szafoni
parent 8155102f7d
commit 0ac21a911b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/mmap/fs_rammap.c
View File

@ -78,7 +78,7 @@ static int msync_rammap(FAR struct mm_map_entry_s *entry, FAR void *start,
fpos = file_seek(filep, entry->offset + offset, SEEK_SET); fpos = file_seek(filep, entry->offset + offset, SEEK_SET);
if (fpos < 0) if (fpos < 0)
{ {
ferr("ERRORL Seek to position %"PRIdOFF" failed\n", fpos); ferr("ERROR: Seek to position %"PRIdOFF" failed\n", fpos);
return fpos; return fpos;
} }
@ -109,7 +109,15 @@ static int msync_rammap(FAR struct mm_map_entry_s *entry, FAR void *start,
/* Restore file pos */ /* Restore file pos */
file_seek(filep, opos, SEEK_SET); fpos = file_seek(filep, opos, SEEK_SET);
if (fpos < 0)
{
/* Ensure that we finally seek back to the current file pos */
ferr("ERROR: Seek back to position %"PRIdOFF" failed\n", fpos);
return fpos;
}
return nwrite >= 0 ? 0 : nwrite; return nwrite >= 0 ? 0 : nwrite;
} }