socket::unix: fix bind function

* ensure not abstract-namespace
* fix socket structures

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/fs/mod.rs

@@ -131,6 +131,7 @@ pub enum FileSystemError {
     IsPipe,
     Interrupted,
     TooSmall,
+    InvalidPath,
 }
 
 impl From<FileSystemError> for AeroSyscallError {
@@ -144,6 +145,7 @@ impl From<FileSystemError> for AeroSyscallError {
             FileSystemError::IsPipe => AeroSyscallError::ESPIPE,
             FileSystemError::Interrupted => AeroSyscallError::EINTR,
             FileSystemError::TooSmall => AeroSyscallError::E2BIG,
+            FileSystemError::InvalidPath => AeroSyscallError::EINVAL,
         }
     }
 }

src/aero_kernel/src/socket/unix.rs

@@ -51,15 +51,24 @@ impl INodeInterface for UnixSocket {
 
     fn bind(&self, address: SocketAddr, _length: usize) -> Result<()> {
         if let SocketAddr::Unix(address) = address {
+            // The abstract namespace socket allows the creation of a socket
+            // connection which does not require a path to be created.
+            let abstrat_namespaced = address.path[0] == 0;
+            assert!(!abstrat_namespaced);
+
             let path_len = address
                 .path
                 .iter()
-                .position(|&b| b == 0)
+                .position(|&c| c == 0)
                 .unwrap_or(address.path.len());
 
-            let path_str = unsafe { core::str::from_utf8_unchecked(&address.path[0..path_len]) };
+            let path_str = core::str::from_utf8(&address.path[..path_len])
+                .ok()
+                .ok_or(FileSystemError::InvalidPath)?;
+
             let path = Path::new(path_str);
 
+            // Ensure that the path is not already in use.
             if fs::lookup_path(path).is_ok() {
                 return Err(FileSystemError::EntryExists);
             }

src/aero_kernel/src/syscall/fs.rs

@@ -276,8 +276,6 @@ pub fn pipe(fds: &mut [usize; 2], flags: usize) -> Result<usize, AeroSyscallErro
 
 #[aero_proc::syscall]
 pub fn unlink(fd: usize, path: &Path, flags: usize) -> Result<usize, AeroSyscallError> {
-    log::debug!("{path:?}");
-
     // TODO: Make use of the open flags.
     let _flags = OpenFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)?;
     let name = path.container();

src/aero_syscall/src/lib.rs

@@ -661,14 +661,14 @@ pub fn sys_sethostname(name: &str) -> Result<usize, AeroSyscallError> {
 #[derive(Debug, Clone)]
 #[repr(C)]
 pub struct SocketAddrUnix {
-    pub family: i16,
+    pub family: u32,
     pub path: [u8; 108],
 }
 
 #[derive(Debug, Clone)]
 #[repr(C)]
 pub struct SocketAddrInet {
-    pub family: i16,
+    pub family: u32,
     pub port: [u8; 2],
     pub address: [u8; 4],
     pub padding: [u8; 8],