Fix buffer overflows noted by Gerardo Puga

 -Erik

1 files changed, 5 insertions, 1 deletions

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 4e50a6d71..f55995685 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -52,9 +52,13 @@ int makedevs_main(int argc, char **argv)
 
                 if (type[0] != 'f')
                         dev = (major << 8) | Sminor;
-                strcpy(devname, basedev);
+                safe_strncpy(devname, basedev, sizeof(devname));
 
                 if (sbase == 0) {
+                        int len;
+                        len = strlen(devname);
+                        if (S > 10000 || len > (sizeof(devname)-6))
+                                error_msg_and_die("%s: number too large", buf);
                         sprintf(buf, "%d", S);
                         strcat(devname, buf);
                 } else {