Changeset 2526

Timestamp:

Feb 5, 2006, 4:40:18 AM (20 years ago)

Author:

bird

Message:

#41: And added special file mode mask getter and extra validations to check that the mode mask we read has a valid type. This also shuts up some bad [f]chmod paths.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/fs.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -12 +12 @@
         o #25: Ensure correct address length returns from recvmsg and recvfrom.
     - libc:
-        o #41: Calc st_ino and st_dev at the end of the unix attrib getter if they
-          are not present. And added special file mode mask getter.
+        o #41: And added special file mode mask getter and extra validations to check that
+          the mode mask we read has a valid type. This also shuts up some bad [f]chmod paths.
+        o #41: Calc st_ino and st_dev at the end of the unix attrib getter if they are not present.
         o #40: Fixed double slash preventing root directories from being opened.
         o #23: Fixed two incorrect EA size fields, now creating symlinks really works.

branches/libc-0.6/src/emx/src/lib/sys/fs.c

@@ -1451 +1451 @@
                             pStat->st_gid  = u32;
                         else if (COMPARE_EANAME(__libc_gszModeEA))
-                            pStat->st_mode = u32;
+                        {
+                            if (    S_ISDIR(u32)  || S_ISCHR(u32) || S_ISBLK(u32)  || S_ISREG(u32)
+                                ||  S_ISFIFO(u32) || S_ISLNK(u32) || S_ISSOCK(u32) || S_ISWHT(u32))
+                                pStat->st_mode = u32;
+                            else
+                                LIBC_ASSERTM_FAILED("Invalid file mode EA: u32=0%o (st_mode=0%o)\n", u32, pStat->st_mode);
+                        }
                         else if (COMPARE_EANAME(__libc_gszRDevEA))
                             pStat->st_rdev = u32;
@@ -1585 +1591 @@
          {
              uint32_t u32 = *(uint32_t *)(pusType + 2);
-             *pMode = u32;
-             rc = 0;
+             if (    S_ISDIR(u32)  || S_ISCHR(u32) || S_ISBLK(u32)  || S_ISREG(u32)
+                 ||  S_ISFIFO(u32) || S_ISLNK(u32) || S_ISSOCK(u32) || S_ISWHT(u32))
+             {
+                 *pMode = u32;
+                 rc = 0;
+             }
+             else
+                 LIBC_ASSERTM_FAILED("Invalid file mode EA: u32=0%o (st_mode=0%o)\n", u32, pStat->st_mode);
          }
          else