2 files changed, 24 insertions, 3 deletions

diff --git a/src/control.rs b/src/control.rs
index 0dbf6d44f..30d5d0924 100644
--- a/src/control.rs
+++ b/src/control.rs
@@ -278,10 +278,27 @@ impl<'a> Control<'a> {
     }
 
     async fn ioctl(&mut self, kind: IoctlType, cmd: u32, iface: u32, buf: &mut [u8]) -> usize {
-        // TODO cancel ioctl on future drop.
+        struct CancelOnDrop<'a>(&'a IoctlState);
+
+        impl CancelOnDrop<'_> {
+            fn defuse(self) {
+                core::mem::forget(self);
+            }
+        }
+
+        impl Drop for CancelOnDrop<'_> {
+            fn drop(&mut self) {
+                self.0.cancel_ioctl();
+            }
+        }
+
+        let ioctl = CancelOnDrop(self.ioctl_state);
+
+        ioctl.0.do_ioctl(kind, cmd, iface, buf).await;
+        let resp_len = ioctl.0.wait_complete().await;
+
+        ioctl.defuse();
 
-        self.ioctl_state.do_ioctl(kind, cmd, iface, buf).await;
-        let resp_len = self.ioctl_state.wait_complete().await;
         resp_len
     }
 }
diff --git a/src/ioctl.rs b/src/ioctl.rs
index 6a7465593..f5ab410db 100644
--- a/src/ioctl.rs
+++ b/src/ioctl.rs
@@ -88,6 +88,10 @@ impl IoctlState {
         pending
     }
 
+    pub fn cancel_ioctl(&self) {
+        self.state.set(IoctlStateInner::Done { resp_len: 0 });
+    }
+
     pub async fn do_ioctl(&self, kind: IoctlType, cmd: u32, iface: u32, buf: &mut [u8]) -> usize {
         warn!("doing ioctl");
         self.state