Merge pull request #10196 from oech3/mknod-u32

mknod: Avoid major/minor No overflow

Author: sylvestre

src/uu/mknod/src/mknod.rs

@@ -143,8 +143,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     let dev = match (
         file_type,
-        matches.get_one::<u64>(options::MAJOR),
-        matches.get_one::<u64>(options::MINOR),
+        matches.get_one::<u32>(options::MAJOR),
+        matches.get_one::<u32>(options::MINOR),
     ) {
         (FileType::Fifo, None, None) => 0,
         (FileType::Fifo, _, _) => {
@@ -208,13 +208,13 @@ pub fn uu_app() -> Command {
             Arg::new(options::MAJOR)
                 .value_name(options::MAJOR)
                 .help(translate!("mknod-help-major"))
-                .value_parser(value_parser!(u64)),
+                .value_parser(value_parser!(u32)),
         )
         .arg(
             Arg::new(options::MINOR)
                 .value_name(options::MINOR)
                 .help(translate!("mknod-help-minor"))
-                .value_parser(value_parser!(u64)),
+                .value_parser(value_parser!(u32)),
         )
         .arg(
             Arg::new(options::SECURITY_CONTEXT)

tests/by-util/test_mknod.rs

@@ -14,6 +14,19 @@ use uutests::util::TestScenario;
 use uutests::util::run_ucmd_as_root;
 use uutests::util_name;
 
+//Reject 2^32+1 major/minor device number
+#[test]
+fn test_mknod_overflow_major_minor() {
+    new_ucmd!()
+        .arg("lg32")
+        .arg("c")
+        .arg("4294967296")
+        .arg("1")
+        .fails_with_code(1)
+        .no_stdout()
+        .stderr_contains("invalid value '4294967296'"); //clap generated message, thats fine.
+}
+
 #[test]
 fn test_mknod_invalid_arg() {
     new_ucmd!()