Merge pull request #233 from Freax13/enhancement/unix-dgram-bind

improve dgram sockets

Author: Freax13

tee/Makefile

@@ -1,7 +1,8 @@
 default:
 
 clippy:
-	cargo clippy --workspace --exclude example --exclude external-tests-wrapper --exclude test-runner-init --exclude vdso -- -D warnings
+	cargo clippy --workspace --exclude example --exclude external-tests-wrapper --exclude kernel --exclude test-runner-init --exclude vdso -- -D warnings
+	cargo clippy -p kernel -- -D warnings
 	cargo clippy -p example -p external-tests-wrapper -p test-runner-init -p tests --tests -- -D warnings
 	$(MAKE) -C vdso clippy
 

tee/kernel/Cargo.toml

@@ -19,7 +19,7 @@ arrayvec = { version = "0.7.4", default-features = false }
 async-trait = "0.1.77"
 bit_field = "0.10.2"
 bitflags = { version = "2.4.2", features = ["bytemuck"] }
-bytemuck = { version = "1.15.0", features = ["derive", "min_const_generics"] }
+bytemuck = { version = "1.15.0", features = ["extern_crate_alloc", "latest_stable_rust"] }
 constants = { workspace = true, features = ["nightly"] }
 crossbeam-utils = { version = "0.8.19", default-features = false }
 either = { version = "1.15.0", default-features = false }

tee/kernel/src/char_dev/char.rs

@@ -30,7 +30,7 @@ use crate::{
             epoll::{EpollReady, EpollRequest, EpollResult, EventCounter, WeakEpollReady},
             inotify::Watchers,
             stream_buffer,
-            unix_socket::StreamUnixSocket,
+            unix_socket::{DgramUnixSocket, StreamUnixSocket},
         },
         node::{
             DirEntry, DirEntryName, DynINode, FileAccessContext, INode, Link, LinkLocation,
@@ -982,7 +982,7 @@ impl Directory for DevPtsDirectory {
         bail!(NoEnt)
     }
 
-    fn bind_socket(
+    fn bind_stream_socket(
         &self,
         _file_name: FileName<'static>,
         _mode: FileMode,
@@ -994,6 +994,18 @@ impl Directory for DevPtsDirectory {
         bail!(NoEnt)
     }
 
+    fn bind_dgram_socket(
+        &self,
+        _file_name: FileName<'static>,
+        _mode: FileMode,
+        _uid: Uid,
+        _gid: Gid,
+        _: &DgramUnixSocket,
+        _socketname: &Path,
+    ) -> Result<()> {
+        bail!(NoEnt)
+    }
+
     fn is_empty(&self) -> bool {
         false
     }

tee/kernel/src/fs/fd/buf.rs

@@ -1,11 +1,12 @@
-use alloc::vec::Vec;
+use alloc::{sync::Arc, vec::Vec};
 use core::{cmp, ptr::NonNull};
 
+use bytemuck::zeroed_arc_slice;
 use usize_conversions::{FromUsize, IntoUsize, usize_from};
 use x86_64::VirtAddr;
 
 use crate::{
-    error::Result,
+    error::{Result, ensure},
     memory::page::KernelPage,
     user::{
         memory::VirtualMemory,
@@ -28,6 +29,19 @@ pub trait WriteBuf {
     fn buffer_len(&self) -> usize;
     fn read(&self, offset: usize, bytes: &mut [u8]) -> Result<()>;
     unsafe fn read_volatile(&self, offset: usize, bytes: NonNull<[u8]>) -> Result<()>;
+
+    fn read_into_arc(&self, max_size: usize) -> Result<Arc<[u8]>> {
+        let len = self.buffer_len();
+        ensure!(len <= max_size, MsgSize);
+        // We need to zero-initialize the data because we can't (safely) assume
+        // that `Self::read_volatile` will actually populate all the bytes.
+        let mut arc = zeroed_arc_slice(len);
+
+        let data = Arc::get_mut(&mut arc).unwrap();
+        self.read(0, data)?;
+
+        Ok(arc)
+    }
 }
 
 pub struct KernelReadBuf<'a>(&'a mut [u8]);