diff --git a/debian/changelog b/debian/changelog
index 9125e7405..b289ac870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux (4.19.37-6) UNRELEASED; urgency=medium
+linux (4.19.37-5+deb10u2) UNRELEASED; urgency=medium
 
   [ Romain Perier ]
   * [x86] x86/insn-eval: Fix use-after-free access to LDT entry (CVE-2019-13233)
@@ -6,8 +6,9 @@ linux (4.19.37-6) UNRELEASED; urgency=medium
   * nfc: Ensure presence of required attributes in the deactivate_target handler
     (CVE-2019-12984)
   * binder: fix race between munmap() and direct reclaim (CVE-2019-1999)
+  * scsi: libsas: fix a race condition when smp task timeout (CVE-2018-20836)
 
- -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 23 Jun 2019 16:15:17 +0200
+ -- Romain Perier <romain.perier@opensource.viveris.fr>  Mon, 22 Jul 2019 14:00:00 +0200
 
 linux (4.19.37-5+deb10u1) buster-security; urgency=high
 
diff --git a/debian/patches/bugfix/all/scsi-libsas-fix-a-race-condition-when-smp-task-timeout.patch b/debian/patches/bugfix/all/scsi-libsas-fix-a-race-condition-when-smp-task-timeout.patch
new file mode 100644
index 000000000..0a9b1dd72
--- /dev/null
+++ b/debian/patches/bugfix/all/scsi-libsas-fix-a-race-condition-when-smp-task-timeout.patch
@@ -0,0 +1,65 @@
+From b90cd6f2b905905fb42671009dc0e27c310a16ae Mon Sep 17 00:00:00 2001
+From: Jason Yan <yanaijie@huawei.com>
+Date: Tue, 25 Sep 2018 10:56:54 +0800
+Subject: scsi: libsas: fix a race condition when smp task timeout
+Origin: https://git.kernel.org/linus/b90cd6f2b905905fb42671009dc0e27c310a16ae
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-20836
+
+When the lldd is processing the complete sas task in interrupt and set the
+task stat as SAS_TASK_STATE_DONE, the smp timeout timer is able to be
+triggered at the same time. And smp_task_timedout() will complete the task
+wheter the SAS_TASK_STATE_DONE is set or not. Then the sas task may freed
+before lldd end the interrupt process. Thus a use-after-free will happen.
+
+Fix this by calling the complete() only when SAS_TASK_STATE_DONE is not
+set. And remove the check of the return value of the del_timer(). Once the
+LLDD sets DONE, it must call task->done(), which will call
+smp_task_done()->complete() and the task will be completed and freed
+correctly.
+
+Reported-by: chenxiang <chenxiang66@hisilicon.com>
+Signed-off-by: Jason Yan <yanaijie@huawei.com>
+CC: John Garry <john.garry@huawei.com>
+CC: Johannes Thumshirn <jthumshirn@suse.de>
+CC: Ewan Milne <emilne@redhat.com>
+CC: Christoph Hellwig <hch@lst.de>
+CC: Tomas Henzl <thenzl@redhat.com>
+CC: Dan Williams <dan.j.williams@intel.com>
+CC: Hannes Reinecke <hare@suse.com>
+Reviewed-by: Hannes Reinecke <hare@suse.com>
+Reviewed-by: John Garry <john.garry@huawei.com>
+Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+---
+ drivers/scsi/libsas/sas_expander.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
+index 52222940d398..0d1f72752ca2 100644
+--- a/drivers/scsi/libsas/sas_expander.c
++++ b/drivers/scsi/libsas/sas_expander.c
+@@ -48,17 +48,16 @@ static void smp_task_timedout(struct timer_list *t)
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&task->task_state_lock, flags);
+-	if (!(task->task_state_flags & SAS_TASK_STATE_DONE))
++	if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
+ 		task->task_state_flags |= SAS_TASK_STATE_ABORTED;
++		complete(&task->slow_task->completion);
++	}
+ 	spin_unlock_irqrestore(&task->task_state_lock, flags);
+-
+-	complete(&task->slow_task->completion);
+ }
+ 
+ static void smp_task_done(struct sas_task *task)
+ {
+-	if (!del_timer(&task->slow_task->timer))
+-		return;
++	del_timer(&task->slow_task->timer);
+ 	complete(&task->slow_task->completion);
+ }
+ 
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/debian/patches/series b/debian/patches/series
index 716a8b69e..f904bd1f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -233,6 +233,7 @@ bugfix/x86/x86-insn-eval-Fix-use-after-free-access-to-LDT-entry.patch
 bugfix/powerpc/powerpc-mm-64s-hash-Reallocate-context-ids-on-fork.patch
 bugfix/all/nfc-Ensure-presence-of-required-attributes-in-the-deactivate_target.patch
 bugfix/all/binder-fix-race-between-munmap-and-direct-reclaim.patch
+bugfix/all/scsi-libsas-fix-a-race-condition-when-smp-task-timeout.patch
 
 # Fix exported symbol versions
 bugfix/all/module-disable-matching-missing-version-crc.patch