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

hostfs:ioctl should return -ENOTTY when the instruction is incompatible

Browse Source 
When sending FIOC_XXXLK to hostfs, hostfs will return -1 by default. For ioctl statements, incompatible instructions should be processed as -ENOTTY by default

Signed-off-by: chenrun1 <chenrun1@xiaomi.com>
This commit is contained in:
chenrun1 2024-05-15 15:34:32 +08:00 committed by Xiang Xiao
parent 6e9a43c504
commit def05ebabb
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/hostfs/hostfs.c
View File

@ -604,15 +604,22 @@ static int hostfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* Call our internal routine to perform the ioctl */ /* Call our internal routine to perform the ioctl */
ret = host_ioctl(hf->fd, cmd, arg); ret = host_ioctl(hf->fd, cmd, arg);
if (ret < 0)
if (ret < 0 && cmd == FIOC_FILEPATH)
{ {
switch (cmd)
{
case FIOC_FILEPATH:
FAR char *path = (FAR char *)(uintptr_t)arg; FAR char *path = (FAR char *)(uintptr_t)arg;
ret = inode_getpath(filep->f_inode, path, PATH_MAX); ret = inode_getpath(filep->f_inode, path, PATH_MAX);
if (ret >= 0) if (ret >= 0)
{ {
strlcat(path, hf->relpath, PATH_MAX); strlcat(path, hf->relpath, PATH_MAX);
} }
break;
default:
ret = -ENOTTY;
}
} }
nxmutex_unlock(&g_lock); nxmutex_unlock(&g_lock);