riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8546 from gebart/pr/vfs-fd-allocation

Browse Source 
sys/vfs: Check suggested fd is valid
This commit is contained in:
Sebastian Meiling 2018-02-12 10:08:06 +01:00 committed by GitHub
commit fb8ade2331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/vfs/vfs.c
View File

@ -871,10 +871,10 @@ static inline int _allocate_fd(int fd)
break;
}
}
if (fd >= VFS_MAX_OPEN_FILES) {
/* The _vfs_open_files array is full */
return -ENFILE;
}
}
if (fd >= VFS_MAX_OPEN_FILES) {
/* The _vfs_open_files array is full */
return -ENFILE;
}
else if (_vfs_open_files[fd].pid != KERNEL_PID_UNDEF) {
/* The desired fd is already in use */

14
tests/unittests/tests-vfs/tests-vfs-bind.c
View File

@ -107,11 +107,25 @@ static void test_vfs_bind__leak_fds(void)
test_vfs_bind();
}
static void test_vfs_bind__allocate_invalid_fd(void)
{
/* Check that fds >= VFS_MAX_OPEN_FILES fails with -ENFILE, to avoid out of
* bounds array access */
/* This test assumes FD numbering begins at 0, update this test if
* VFS_MAX_OPEN_FILES is a valid fd number */
int fd;
fd = vfs_bind(VFS_MAX_OPEN_FILES, O_RDONLY, &_test_bind_ops, NULL);
TEST_ASSERT_EQUAL_INT(-ENFILE, fd);
fd = vfs_bind((VFS_MAX_OPEN_FILES + 1), O_RDONLY, &_test_bind_ops, NULL);
TEST_ASSERT_EQUAL_INT(-ENFILE, fd);
}
Test *tests_vfs_bind_tests(void)
{
EMB_UNIT_TESTFIXTURES(fixtures) {
new_TestFixture(test_vfs_bind),
new_TestFixture(test_vfs_bind__leak_fds),
new_TestFixture(test_vfs_bind__allocate_invalid_fd),
};
EMB_UNIT_TESTCALLER(vfs_bind_tests, NULL, NULL, fixtures);