Changeset 86042ae in rtems

Timestamp:

Nov 25, 2003, 5:27:55 PM (17 years ago)

Author:

Jennifer Averett <Jennifer.Averett@…>

Children:

c11ca814

Parents:

7fa97181

Message:

2003-11-25 Jennifer Averett <jennifer@…>

PR 519/filesystem

• include/rtems/libio_.h, src/eval.c, src/rmdir.c, src/unlink.c: Check write permissions in parent directory for file or directory delete

Location:

cpukit/libcsupport

Files:

• ChangeLog (modified) (1 diff)
• include/rtems/libio_.h (modified) (1 diff)
• src/eval.c (modified) (1 diff)
• src/rmdir.c (modified) (1 diff)
• src/unlink.c (modified) (1 diff)

cpukit/libcsupport/ChangeLog

@@ +1 @@
+2003-11-25      Jennifer Averett <jennifer@OARcorp.com>
+
+        PR 519/filesystem
+        * include/rtems/libio_.h, src/eval.c, src/rmdir.c, src/unlink.c: 
+        Check write permissions in parent directory for file or 
+        directory delete
+
 2003-10-22      Joel Sherrill <joel@OARcorp.com>
 

cpukit/libcsupport/include/rtems/libio_.h

@@ -228 +228 @@
 );
 
+int rtems_filesystem_evaluate_parent(
+  int                                flags,
+  rtems_filesystem_location_info_t  *pathloc
+);
+
 void rtems_filesystem_initialize();
 

cpukit/libcsupport/src/eval.c

@@ -98 +98 @@
 }
 
+
+int rtems_filesystem_evaluate_parent(
+  int                                flags,
+  rtems_filesystem_location_info_t  *pathloc
+)
+{
+  rtems_filesystem_location_info_t  parent;
+  int                               result;
+ 
+  if ( !pathloc )
+    rtems_set_errno_and_return_minus_one( EIO );       /* should never happen */
+  
+  if ( !pathloc->ops->evalpath_h )
+    rtems_set_errno_and_return_minus_one( ENOTSUP );
+
+  parent = *pathloc;
+  result = (*pathloc->ops->evalpath_h)( "..", flags, &parent );
+  if (result != 0){
+    return -1;
+  }
+  rtems_filesystem_freenode( &parent );
+  return result;
+}
+

cpukit/libcsupport/src/rmdir.c

@@ -40 +40 @@
      return -1;
 
+  result = rtems_filesystem_evaluate_parent(RTEMS_LIBIO_PERMS_WRITE, &loc );
+  if (result != 0){
+    rtems_filesystem_freenode( &loc );
+    return -1;
+  }
+
   /*
    * Verify you can remove this node as a directory.

cpukit/libcsupport/src/unlink.c

@@ -36 +36 @@
      return -1;
   
+  result = rtems_filesystem_evaluate_parent(RTEMS_LIBIO_PERMS_WRITE, &loc );
+  if (result != 0){
+    rtems_filesystem_freenode( &loc );
+    return -1;
+  }
+
   if ( !loc.ops->node_type_h ) {
     rtems_filesystem_freenode( &loc );