inet: fix SIOCGIFHWADDR

Signed-off-by: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>

Author: Andy-Python-Programmer

src/aero_kernel/src/socket/inet.rs

@@ -229,8 +229,16 @@ impl INodeInterface for InetSocket {
     fn ioctl(&self, command: usize, arg: usize) -> fs::Result<usize> {
         match command {
             SIOCGIFHWADDR => {
-                let hwaddr =
-                    unsafe { core::slice::from_raw_parts_mut(arg as *mut u8, MacAddr::ADDR_SIZE) };
+                let ifreq = VirtAddr::new(arg as _)
+                    .read_mut::<IfReq>()
+                    .ok_or(FileSystemError::NotSupported)?;
+
+                let name = ifreq.name().ok_or(FileSystemError::InvalidPath)?;
+                assert!(name == "eth0");
+
+                let hwaddr = unsafe {
+                    core::slice::from_raw_parts_mut(ifreq.sa_data.as_mut_ptr(), MacAddr::ADDR_SIZE)
+                };
 
                 let mac_addr = net::default_device().mac();
                 hwaddr.copy_from_slice(&mac_addr.0.as_slice());

src/aero_syscall/src/consts.rs

@@ -17,8 +17,6 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
-use core::ffi::CStr;
-
 use crate::OpenFlags;
 
 // syscall number constants:
@@ -367,12 +365,8 @@ impl IfReq {
     /// Get the interface name, e.g. "en0". [`None`] is returned if UTF-8
     /// validation failed.
     pub fn name(&self) -> Option<&str> {
-        match CStr::from_bytes_until_nul(&self.name) {
-            Ok(s) => s.to_str(),
-            // The name does not have a null terminator, that means
-            // the whole buffer has the name.
-            Err(_) => core::str::from_utf8(&self.name),
-        }
-        .ok()
+        let null_index = self.name.iter().position(|&x| x == 0).unwrap_or_default();
+        let name = &self.name[..null_index];
+        core::str::from_utf8(name).ok()
     }
 }