aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <griebl@gmx.de>2004-07-20 18:36:51 +0000
committerRobert Griebl <griebl@gmx.de>2004-07-20 18:36:51 +0000
commitbd8dd1e76382eaa6b46f921b7bb6db085f55289a (patch)
tree57af8095626afedd85cb3dfcee2b79750c6d93cd
parent809387fe9e47d5b3a62764ffdd0278194361ca7f (diff)
downloadbusybox-w32-bd8dd1e76382eaa6b46f921b7bb6db085f55289a.tar.gz
busybox-w32-bd8dd1e76382eaa6b46f921b7bb6db085f55289a.tar.bz2
busybox-w32-bd8dd1e76382eaa6b46f921b7bb6db085f55289a.zip
Patch from Mike Snitzer <snitzer@gmail.com>:
Please see the attached patch for the following crash with busybox' 2.6 rmmod support
-rw-r--r--modutils/rmmod.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 3693aec7c..f4e65d0ce 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -106,13 +106,13 @@ extern int rmmod_main(int argc, char **argv)
106 bb_show_usage(); 106 bb_show_usage();
107 107
108 { 108 {
109 for (n = optind; n < argc; n++) {
109#ifdef CONFIG_FEATURE_2_6_MODULES 110#ifdef CONFIG_FEATURE_2_6_MODULES
110 char module_name[strlen(argv[n]) + 1]; 111 char module_name[strlen(argv[n]) + 1];
111 filename2modname(module_name, argv[n]); 112 filename2modname(module_name, argv[n]);
112#else 113#else
113#define module_name argv[n] 114#define module_name argv[n]
114#endif 115#endif
115 for (n = optind; n < argc; n++) {
116 if (syscall(__NR_delete_module, module_name, flags) < 0) { 116 if (syscall(__NR_delete_module, module_name, flags) < 0) {
117 bb_perror_msg("%s", argv[n]); 117 bb_perror_msg("%s", argv[n]);
118 ret = EXIT_FAILURE; 118 ret = EXIT_FAILURE;