Change to strnlen() and strncpy() to avoid problems from unbounded strings

[yaffs2.git] / yportenv.h

diff --git a/yportenv.h b/yportenv.h
index 28e205bbd8cb2c4c3d1603aa119d92822e9d210b..1967cb10cef9048777814c000461a5dbb7442bb6 100644 (file)
--- a/yportenv.h
+++ b/yportenv.h
@@ -55,7 +55,7 @@
 #define yaffs_strcpy(a, b)     strcpy(a, b)
 #define yaffs_strncpy(a, b, c) strncpy(a, b, c)
 #define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-#define yaffs_strlen(s)               strlen(s)
+#define yaffs_strnlen(s,m)     strnlen(s,m)
 #define yaffs_sprintf         sprintf
 #define yaffs_toupper(a)       toupper(a)
 
@@ -74,8 +74,8 @@
 /* KR - added for use in scan so processes aren't blocked indefinitely. */
 #define YYIELD() schedule()
 
-#define YAFFS_ROOT_MODE                        0666
-#define YAFFS_LOSTNFOUND_MODE          0666
+#define YAFFS_ROOT_MODE                        0755
+#define YAFFS_LOSTNFOUND_MODE          0700
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
@@ -94,7 +94,7 @@
 #define TOUT(p) printk p
 
 #define yaffs_trace(mask, fmt, args...) \
-       do { if ((mask) & (yaffs_traceMask|YAFFS_TRACE_ERROR)) \
+       do { if ((mask) & (yaffs_traceMask| YAFFS_TRACE_ALWAYS)) \
                printk(KERN_WARNING "yaffs: " fmt, ## args); \
        } while (0)
 
@@ -129,7 +129,7 @@
 #define yaffs_strcat(a, b)     strcat(a, b)
 #define yaffs_strcpy(a, b)     strcpy(a, b)
 #define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-#define yaffs_strlen(s)               strlen(s)
+#define yaffs_strnlen(s,m)            strnlen(s,m)
 #define yaffs_sprintf         sprintf
 #define yaffs_toupper(a)       toupper(a)
 
@@ -146,8 +146,8 @@
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
 /* #define YPRINTF(x) printf x */
 
-#define YAFFS_ROOT_MODE                                0666
-#define YAFFS_LOSTNFOUND_MODE          0666
+#define YAFFS_ROOT_MODE                        0755
+#define YAFFS_LOSTNFOUND_MODE          0700
 
 #define yaffs_SumCompare(x, y) ((x) == (y))
 #define yaffs_strcmp(a, b) strcmp(a, b)