diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-08-27 17:33:11 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-08-27 17:33:11 +0000 |
| commit | ed4a3f6e367796fdc6343790d9fa60bcfe7e5f31 (patch) | |
| tree | d3a036cb0fd27003cdf513d2c4f637119ddd5fb5 /cpukit/libfs | |
| parent | 2010-08-26 Chris Johns <chrisj@rtems.org> (diff) | |
| download | rtems-ed4a3f6e367796fdc6343790d9fa60bcfe7e5f31.tar.bz2 | |
2010-08-27 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1692/filesystem
* libcsupport/include/rtems/libio.h, libfs/src/devfs/devfs_eval.c,
libfs/src/imfs/imfs_eval.c: Fix implementation and use of
rtems_libio_is_valid_perms().
Diffstat (limited to 'cpukit/libfs')
| -rw-r--r-- | cpukit/libfs/src/devfs/devfs_eval.c | 6 | ||||
| -rw-r--r-- | cpukit/libfs/src/imfs/imfs_eval.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/cpukit/libfs/src/devfs/devfs_eval.c b/cpukit/libfs/src/devfs/devfs_eval.c index 0df5754ad5..a3169fb3fa 100644 --- a/cpukit/libfs/src/devfs/devfs_eval.c +++ b/cpukit/libfs/src/devfs/devfs_eval.c @@ -40,10 +40,8 @@ int devFS_evaluate_path( rtems_device_name_t *device_name_table; /* see if 'flags' is valid */ - if ( !rtems_libio_is_valid_perms( flags ) ) { - assert( 0 ); - rtems_set_errno_and_return_minus_one( EIO ); - } + if ( !rtems_libio_is_valid_perms( flags ) ) + rtems_set_errno_and_return_minus_one( EPERM ); /* get the device name table */ device_name_table = (rtems_device_name_t *)pathloc->node_access; diff --git a/cpukit/libfs/src/imfs/imfs_eval.c b/cpukit/libfs/src/imfs/imfs_eval.c index b282e7c9a4..7aba2b535e 100644 --- a/cpukit/libfs/src/imfs/imfs_eval.c +++ b/cpukit/libfs/src/imfs/imfs_eval.c @@ -82,10 +82,8 @@ int IMFS_evaluate_permission( IMFS_jnode_t *jnode; int flags_to_test; - if ( !rtems_libio_is_valid_perms( flags ) ) { - assert( 0 ); - rtems_set_errno_and_return_minus_one( EIO ); - } + if ( !rtems_libio_is_valid_perms( flags ) ) + rtems_set_errno_and_return_minus_one( EPERM ); jnode = node->node_access; |