Changeset 52b44c6 in mainline

Timestamp:

2019-02-23T23:01:31Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0c48e14, ee8d4d6

Parents:

ca0e838

git-author:

Wang Jianjian <wangjianjian3@…> (2019-02-23 06:20:33)

git-committer:

Jakub Jermar <jakub@…> (2019-02-23 23:01:31)

Message:

srv/vfs: return after checking old fd's validity

It's possible for a user to call vfs_clone with invalid fds,
both the old and new ones when they are same. And if it's the case,
we should check its validity or user maybe got a invalid one.

Signed-off-by: Wang Jianjian <wangjianjian3@…>

File:

• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -90 +90 @@
         errno_t rc;
 
-        /* If the file descriptors are the same, do nothing. */
-        if (oldfd == newfd)
-                return EOK;
-
         /* Lookup the file structure corresponding to fd. */
         vfs_file_t *oldfile = vfs_file_get(oldfd);
@@ -100 +96 @@
 
         assert(oldfile->node != NULL);
+
+        /* If the file descriptors are the same, do nothing. */
+        if (oldfd == newfd) {
+                vfs_file_put(oldfile);
+                return EOK;
+        }
 
         if (newfd != -1) {