cadcdev-svn-commits

[cadcdev-svn-commits] SF.net SVN: cadcdev:[744] kos/kernel/fs/fs.c

[<ljs...@us...>]

Revision: 744
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=744&view=rev
Author:   ljsebald
Date:     2012-02-17 02:44:28 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
<Ayla> last patch, kernel/fs/fs.c:134 should return NULL, not 0
<humble_hoser> +1 for pedantic patch
<humble_hoser> ;)
<PingChan> #define NULL 0
<PingChan> therefore, 0 is proper :P
<Ayla> humble_hoser, that hurts me
<Ayla> I just want to fix warnings

(From the #dreamcastdev channel on freenode)

Modified Paths:
--------------
    kos/kernel/fs/fs.c

Modified: kos/kernel/fs/fs.c
===================================================================
--- kos/kernel/fs/fs.c	2011-12-31 18:10:30 UTC (rev 743)
+++ kos/kernel/fs/fs.c	2012-02-17 02:44:28 UTC (rev 744)
@@ -134,7 +134,7 @@
 	/* Invoke the handler */
 	if (cur->open == NULL) {
 		errno = ENOSYS;
-		return 0;
+		return NULL;
 	}
 	h = cur->open(cur, cname, mode);
 	if (h == NULL) return NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[cadcdev-svn-commits] SF.net SVN: cadcdev:[745] kos/kernel/fs/fs.c

[<ljs...@us...>]

Revision: 745
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=745&view=rev
Author:   ljsebald
Date:     2012-02-17 22:37:44 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Protect fs_dup() and fs_dup2() against invalid file descriptors.

Modified Paths:
--------------
    kos/kernel/fs/fs.c

Modified: kos/kernel/fs/fs.c
===================================================================
--- kos/kernel/fs/fs.c	2012-02-17 02:44:28 UTC (rev 744)
+++ kos/kernel/fs/fs.c	2012-02-17 22:37:44 UTC (rev 745)
@@ -266,19 +266,28 @@
 
 file_t fs_dup(file_t oldfd) {
 	/* Make sure it exists */
-	if (!fd_table[oldfd]) {
+	if (oldfd < 0 || oldfd >= FD_SETSIZE) {
 		errno = EBADF;
 		return -1;
 	}
+	else if (!fd_table[oldfd]) {
+		errno = EBADF;
+		return -1;
+	}
 
 	return fs_hnd_assign(fd_table[oldfd]);
 }
 
 file_t fs_dup2(file_t oldfd, file_t newfd) {
-	if (!fd_table[oldfd]) {
+	/* Make sure the descriptors are valid */
+	if (oldfd < 0 || oldfd >= FD_SETSIZE || newfd < 0 || newfd >= FD_SETSIZE) {
 		errno = EBADF;
 		return -1;
 	}
+	else if (!fd_table[oldfd]) {
+		errno = EBADF;
+		return -1;
+	}
 
 	if (fd_table[newfd])
 		fs_close(newfd);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.