svn commit: trunk/busybox/modutils

[vda at busybox.net]

Author: vda
Date: 2009-02-26 12:00:52 +0000 (Thu, 26 Feb 2009)
New Revision: 25462

Log:
modutils: oveflow fix



Modified:
   trunk/busybox/modutils/modutils.c
   trunk/busybox/modutils/modutils.h


Changeset:
Modified: trunk/busybox/modutils/modutils.c
===================================================================
--- trunk/busybox/modutils/modutils.c	2009-02-26 12:00:29 UTC (rev 25461)
+++ trunk/busybox/modutils/modutils.c	2009-02-26 12:00:52 UTC (rev 25462)
@@ -71,7 +71,7 @@
 	if (modname == NULL)
 		modname = xmalloc(MODULE_NAME_LEN);
 	from = bb_get_last_path_component_nostrip(filename);
-	for (i = 0; i < MODULE_NAME_LEN && from[i] != '\0' && from[i] != '.'; i++)
+	for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
 		modname[i] = (from[i] == '-') ? '_' : from[i];
 	modname[i] = 0;
 

Modified: trunk/busybox/modutils/modutils.h
===================================================================
--- trunk/busybox/modutils/modutils.h	2009-02-26 12:00:29 UTC (rev 25461)
+++ trunk/busybox/modutils/modutils.h	2009-02-26 12:00:52 UTC (rev 25462)
@@ -15,8 +15,9 @@
 # pragma GCC visibility push(hidden)
 #endif
 
-/* As defined in linux/include/linux/module.h */
-#define MODULE_NAME_LEN 64
+/* linux/include/linux/module.h has 64, but this is also used
+ * internally for the maximum alias name length, which can be quite long */
+#define MODULE_NAME_LEN 256
 
 const char *moderror(int err) FAST_FUNC;
 llist_t *llist_find(llist_t *first, const char *str) FAST_FUNC;