[git commit] modprobe-small: fix safe_strncpy truncating last char of module name

Denys Vlasenko vda.linux at googlemail.com
Mon May 26 13:01:13 UTC 2014


commit: http://git.busybox.net/busybox/commit/?id=fd0640e5a12f74b7ab1d918cf884df0c59402c5a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 modutils/modprobe-small.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 91e0c13..b7990bf 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -297,7 +297,7 @@ static int pathname_matches_modname(const char *pathname, const char *modname)
 	char name[MODULE_NAME_LEN];
 	const char *fname = bb_get_last_path_component_nostrip(pathname);
 	const char *suffix = strrstr(fname, ".ko");
-	safe_strncpy(name, fname, suffix - fname);
+	safe_strncpy(name, fname, suffix - fname + 1);
 	replace(name, '-', '_');
 	r = (strcmp(name, modname) == 0);
 	return r;


More information about the busybox-cvs mailing list