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

fs/vfs: reuse file_dup2 directly in file_dup to fix segfault issue

Browse Source 
Or close the fd2 return by dup() would segment fault since filep->f_priv
null access.

Change-Id: I285c86f54bbb486d6c2c5aea53952f69083dca72
Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao 2020-09-08 14:13:49 +08:00 committed by David Sidrane
parent 9106c4ec2b
commit bf06776f7c
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/vfs/fs_dupfd.c
View File

@ -50,13 +50,14 @@
* accepts a struct file instance instead of a file descriptor. * accepts a struct file instance instead of a file descriptor.
* *
* Returned Value: * Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on * The new file descriptor is returned on success; a negated errno value
* any failure. * is returned on any failure.
* *
****************************************************************************/ ****************************************************************************/
int file_dup(FAR struct file *filep, int minfd) int file_dup(FAR struct file *filep, int minfd)
{ {
FAR struct file *filep2;
int fd2; int fd2;
int ret; int ret;
@ -67,21 +68,26 @@ int file_dup(FAR struct file *filep, int minfd)
return -EBADF; return -EBADF;
} }
/* Increment the reference count on the contained inode */ /* Then allocate a new file descriptor for the inode */
ret = inode_addref(filep->f_inode); fd2 = files_allocate(NULL, 0, 0, minfd);
if (fd2 < 0)
{
return -EMFILE;
}
ret = fs_getfilep(fd2, &filep2);
if (ret < 0) if (ret < 0)
{ {
files_release(fd2);
return ret; return ret;
} }
/* Then allocate a new file descriptor for the inode */ ret = file_dup2(filep, filep2);
if (ret < 0)
fd2 = files_allocate(filep->f_inode, filep->f_oflags, filep->f_pos, minfd);
if (fd2 < 0)
{ {
inode_release(filep->f_inode); files_release(fd2);
return -EMFILE; return ret;
} }
return fd2; return fd2;
@ -95,8 +101,8 @@ int file_dup(FAR struct file *filep, int minfd)
* value greater than or equal to 'minfd'). * value greater than or equal to 'minfd').
* *
* Returned Value: * Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on * The new file descriptor is returned on success; a negated errno value
* any failure. * is returned on any failure.
* *
****************************************************************************/ ****************************************************************************/