diff --git a/debian/changelog b/debian/changelog
index ca7220c0f..062777f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,9 @@ linux (4.14.11-1) UNRELEASED; urgency=medium
   [ Salvatore Bonaccorso ]
   * [rt] Update to 4.14.8-rt9
   * Bump ABI to 3
+  * Revert "scsi: libsas: allow async aborts"
+    Fixes "Oops: NULL pointer dereference - RIP:
+    isci_task_abort_task+0x30/0x3e0 [isci]" (Closes: #882414)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 28 Dec 2017 01:18:05 +0000
 
diff --git a/debian/patches/debian/revert-scsi-libsas-allow-async-aborts.patch b/debian/patches/debian/revert-scsi-libsas-allow-async-aborts.patch
new file mode 100644
index 000000000..1e1468e50
--- /dev/null
+++ b/debian/patches/debian/revert-scsi-libsas-allow-async-aborts.patch
@@ -0,0 +1,26 @@
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Fri, 5 Jan 2018 13:36:38 +0100
+Subject: Revert "scsi: libsas: allow async aborts"
+Bug-Debian: https://bugs.debian.org/882414
+
+---
+ drivers/scsi/libsas/sas_scsi_host.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
+index ea8ad06ff582..e81c8590d254 100644
+--- a/drivers/scsi/libsas/sas_scsi_host.c
++++ b/drivers/scsi/libsas/sas_scsi_host.c
+@@ -491,6 +491,9 @@ int sas_eh_abort_handler(struct scsi_cmnd *cmd)
+ 	struct Scsi_Host *host = cmd->device->host;
+ 	struct sas_internal *i = to_sas_internal(host->transportt);
+ 
++	if (current != host->ehandler)
++		return FAILED;
++
+ 	if (!i->dft->lldd_abort_task)
+ 		return FAILED;
+ 
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index cd8f5cc29..d2d154eda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -82,6 +82,7 @@ bugfix/all/i40e-i40evf-organize-and-re-number-feature-flags.patch
 bugfix/all/i40e-fix-flags-declaration.patch
 bugfix/all/xen-time-do-not-decrease-steal-time-after-live-migra.patch
 bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
+debian/revert-scsi-libsas-allow-async-aborts.patch
 
 # Miscellaneous features