Merge pull request #1251 from microsoft/bugfix-inetstack-check-local-…

…addr

[inetstack] Check bind to local IP

src/rust/demikernel/libos/mod.rs

@@ -119,6 +119,7 @@ impl LibOS {
             LibOSName::Catnap => Self::NetworkLibOS(NetworkLibOSWrapper::Catnap(SharedNetworkLibOS::<
                 SharedCatnapTransport,
             >::new(
+                config.local_ipv4_addr(),
                 runtime.clone(),
                 SharedCatnapTransport::new(&config, &mut runtime),
             ))),
@@ -133,7 +134,9 @@ impl LibOS {
                 Self::NetworkLibOS(NetworkLibOSWrapper::Catpowder(SharedNetworkLibOS::<
                     SharedInetStack<LinuxRuntime>,
                 >::new(
-                    runtime.clone(), inetstack
+                    config.local_ipv4_addr(),
+                    runtime.clone(),
+                    inetstack,
                 )))
             },
             #[cfg(feature = "catnip-libos")]
@@ -146,7 +149,9 @@ impl LibOS {
                 Self::NetworkLibOS(NetworkLibOSWrapper::Catnip(SharedNetworkLibOS::<
                     SharedInetStack<SharedDPDKRuntime>,
                 >::new(
-                    runtime.clone(), inetstack
+                    config.local_ipv4_addr(),
+                    runtime.clone(),
+                    inetstack,
                 )))
             },
             #[cfg(feature = "catmem-libos")]
@@ -157,6 +162,7 @@ impl LibOS {
             LibOSName::Catloop => Self::NetworkLibOS(NetworkLibOSWrapper::Catloop(SharedNetworkLibOS::<
                 SharedCatloopTransport,
             >::new(
+                config.local_ipv4_addr(),
                 runtime.clone(),
                 SharedCatloopTransport::new(&config, runtime.clone()),
             ))),
@@ -512,9 +518,8 @@ impl LibOS {
     pub fn wait_next_n<Acceptor: FnMut(demi_qresult_t) -> bool>(
         &mut self,
         acceptor: Acceptor,
-        timeout: Option<Duration>
-    ) -> Result<(), Fail>
-    {
+        timeout: Option<Duration>,
+    ) -> Result<(), Fail> {
         timer!("demikernel::wait_next_n");
         match self {
             #[cfg(any(

src/rust/demikernel/libos/network/libos.rs

@@ -76,6 +76,7 @@ use crate::pal::linux::socketaddrv4_to_sockaddr;
 /// Catnap libOS. All state is kept in the [runtime] and [qtable].
 /// TODO: Move [qtable] into [runtime] so all state is contained in the PosixRuntime.
 pub struct NetworkLibOS<T: NetworkTransport> {
+    local_ipv4_addr: Ipv4Addr,
     /// Underlying runtime.
     runtime: SharedDemiRuntime,
     /// Underlying network transport.
@@ -92,8 +93,9 @@ pub struct SharedNetworkLibOS<T: NetworkTransport>(SharedObject<NetworkLibOS<T>>
 /// Associate Functions for Catnap LibOS
 impl<T: NetworkTransport> SharedNetworkLibOS<T> {
     /// Instantiates a Catnap LibOS.
-    pub fn new(runtime: SharedDemiRuntime, transport: T) -> Self {
+    pub fn new(local_ipv4_addr: Ipv4Addr, runtime: SharedDemiRuntime, transport: T) -> Self {
         Self(SharedObject::new(NetworkLibOS::<T> {
+            local_ipv4_addr,
             runtime: runtime.clone(),
             transport,
         }))
@@ -127,13 +129,24 @@ impl<T: NetworkTransport> SharedNetworkLibOS<T> {
     pub fn bind(&mut self, qd: QDesc, mut local: SocketAddr) -> Result<(), Fail> {
         trace!("bind() qd={:?}, local={:?}", qd, local);
 
+        // We only support IPv4 addresses right now.
         let localv4: SocketAddrV4 = unwrap_socketaddr(local)?;
-        // Check if we are binding to the wildcard address. We only support this for UDP sockets right now.
+
+        // Check address that we are using to bind. We only support the wildcard address for UDP sockets right now.
         // FIXME: https://github.com/demikernel/demikernel/issues/189
-        if localv4.ip() == &Ipv4Addr::UNSPECIFIED && self.get_shared_queue(&qd)?.get_qtype() != QType::UdpSocket {
-            let cause: String = format!("cannot bind to wildcard address (qd={:?})", qd);
-            error!("bind(): {}", cause);
-            return Err(Fail::new(libc::ENOTSUP, &cause));
+        match *localv4.ip() {
+            Ipv4Addr::UNSPECIFIED if self.get_shared_queue(&qd)?.get_qtype() == QType::UdpSocket => (),
+            Ipv4Addr::UNSPECIFIED => {
+                let cause: String = format!("cannot bind to wildcard address (qd={:?})", qd);
+                error!("bind(): {}", cause);
+                return Err(Fail::new(libc::ENOTSUP, &cause));
+            },
+            addr if addr != self.local_ipv4_addr => {
+                let cause: String = format!("cannot bind to non-local address: {:?}", addr);
+                error!("bind(): {}", &cause);
+                return Err(Fail::new(libc::EADDRNOTAVAIL, &cause));
+            },
+            _ => (),
         }
 
         // Check if this is an ephemeral port.
@@ -508,11 +521,11 @@ impl<T: NetworkTransport> SharedNetworkLibOS<T> {
     pub fn wait_next_n<Acceptor: FnMut(demi_qresult_t) -> bool>(
         &mut self,
         mut acceptor: Acceptor,
-        timeout: Duration
-    ) -> Result<(), Fail>
-    {
-        self.runtime.clone().wait_next_n(
-            |qt, qd, result| acceptor(self.create_result(result, qd, qt)), timeout)
+        timeout: Duration,
+    ) -> Result<(), Fail> {
+        self.runtime
+            .clone()
+            .wait_next_n(|qt, qd, result| acceptor(self.create_result(result, qd, qt)), timeout)
     }
 
     pub fn create_result(&self, result: OperationResult, qd: QDesc, qt: QToken) -> demi_qresult_t {

src/rust/inetstack/mod.rs

@@ -98,6 +98,9 @@ pub struct InetStack<N: NetworkRuntime> {
     runtime: SharedDemiRuntime,
     network: N,
     local_link_addr: MacAddress,
+    // Keeping this here for now in case we want to use it.
+    #[allow(unused)]
+    local_ipv4_addr: Ipv4Addr,
 }
 
 #[derive(Clone)]
@@ -141,7 +144,8 @@ impl<N: NetworkRuntime> SharedInetStack<N> {
             ipv4,
             runtime: runtime.clone(),
             network,
-            local_link_addr: local_link_addr,
+            local_link_addr,
+            local_ipv4_addr,
         }));
         runtime.insert_background_coroutine("inetstack::poll_recv", Box::pin(me.clone().poll().fuse()))?;
         Ok(me)

src/rust/inetstack/protocols/tcp/peer.rs

@@ -139,9 +139,12 @@ impl<N: NetworkRuntime> SharedTcpPeer<N> {
         // Wait for accept to complete.
         match socket.accept().await {
             Ok(socket) => {
-                self.addresses.insert(SocketId::Active(socket.local().unwrap(), socket.remote().unwrap()), socket.clone());
+                self.addresses.insert(
+                    SocketId::Active(socket.local().unwrap(), socket.remote().unwrap()),
+                    socket.clone(),
+                );
                 Ok(socket)
-            }
+            },
             Err(e) => Err(e),
         }
     }

src/rust/inetstack/test_helpers/engine.rs

@@ -64,7 +64,9 @@ impl SharedEngine {
         )?;
 
         Ok(Self(SharedNetworkLibOS::<SharedInetStack<SharedTestRuntime>>::new(
-            runtime, transport,
+            test_rig.get_ip_addr(),
+            runtime,
+            transport,
         )))
     }
 

tests/rust/common/libos.rs

@@ -86,7 +86,7 @@ impl DummyLibOS {
         logging::initialize();
         let transport = SharedInetStack::new_test(runtime.clone(), network, link_addr, ipv4_addr)?;
         Ok(Self(SharedNetworkLibOS::<SharedInetStack<SharedDummyRuntime>>::new(
-            runtime, transport,
+            ipv4_addr, runtime, transport,
         )))
     }