Walt Wimer noticed that mknod couldn't handle major or minor > 255. Now our

limit checking autodetects what the system supports (at compile time).


git-svn-id: svn://busybox.net/trunk/busybox@14456 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 4 insertions, 2 deletions

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 7b2467b8f..b6e85272d 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -47,8 +47,10 @@ extern int mknod_main(int argc, char **argv)
 
                 dev = 0;
                 if ((*name != 'p') && ((argc -= 2) == 2)) {
-                        dev = (bb_xgetularg10_bnd(argv[2], 0, 255) << 8)
-                                + bb_xgetularg10_bnd(argv[3], 0, 255);
+                        /* Autodetect what the system supports; thexe macros should
+                         * optimize out to two constants. */
+                        dev = makedev(bb_xgetularg10_bnd(argv[2], 0, major(UINT_MAX)),
+                                                  bb_xgetularg10_bnd(argv[3], 0, minor(UINT_MAX)));
                 }
 
                 if (argc == 2) {