diff --git a/0021-Fix-segmentation-fault-problem.patch b/0021-Fix-segmentation-fault-problem.patch
new file mode 100644
index 0000000000000000000000000000000000000000..29390c18002514ba669faee5d8bbbb2c5c8ad957
--- /dev/null
+++ b/0021-Fix-segmentation-fault-problem.patch
@@ -0,0 +1,34 @@
+From 00310fdc2ff77fac84d871a76af67750eacb8594 Mon Sep 17 00:00:00 2001
+From: geruijun <geruijun@huawei.com>
+Date: Wed, 15 Jun 2022 10:06:40 +0800
+Subject: [PATCH] Fix segmentation fault problem.
+
+When execute iscsi_task_mgmt_lun_reset_async function,
+pdus are already removed from waitpdu list. In iscsi_service
+function, this will call iscsi_process_pdu and release
+pdu from waitpdu again, which cause segmentation fault.
+
+Whether waitpud list is NULL should be checked here to avoid
+the problem.
+
+Signed-off-by: geruijun <geruijun@huawei.com>
+---
+ lib/pdu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/pdu.c b/lib/pdu.c
+index 6fe70db..f9c0bc5 100644
+--- a/lib/pdu.c
++++ b/lib/pdu.c
+@@ -622,7 +622,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
+ 			return -1;
+ 		}
+ 
+-		if (is_finished) {
++		if (is_finished && iscsi->waitpdu != NULL) {
+ 			ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
+ 			iscsi->drv->free_pdu(iscsi, pdu);
+ 		}
+-- 
+1.8.3.1
+
diff --git a/libiscsi.spec b/libiscsi.spec
index 296592e1a43a770b837208725b47019a6ef3b29b..74bd6c1889d0e0dbf10b38516bf4e84d0827f11d 100644
--- a/libiscsi.spec
+++ b/libiscsi.spec
@@ -1,6 +1,6 @@
 Name:          libiscsi
 Version:       1.19.0
-Release:       8
+Release:       9
 Summary:       Client-side library to implement the iSCSI protocol
 Recommends:    %{name}-utils
 License:       LGPLv2+ and GPLv2+
@@ -26,6 +26,7 @@ Patch17:       0017-Updata-iscsi-dd.c.patch
 Patch18:       0018-iscsi-swp-handle-setting-of-debug_level-correctly.patch
 Patch19:       0019-fix-iscsi-ls-parameter-parse.patch
 Patch20:       0020-Check-return-value-of-scsi_malloc-in-order-to.patch
+Patch21:       0021-Fix-segmentation-fault-problem.patch
 
 Source:        https://github.com/sahlberg/%{name}/archive/%{version}.tar.gz
 
@@ -127,6 +128,9 @@ This package contains utilities of %{name} to connect to iSCSI targets
 %{_bindir}/iscsi-test-cu
 
 %changelog
+* Wed Jun 15 2022 Ruijun Ge <geruijun@huawei.com> - 1.19.0-9
+- DESC: backport patch to solve segmentation fault problem
+
 * Fri Jun 10 2022 Ruijun Ge <geruijun@huawei.com> - 1.19.0-8
 - DESC: backport patches to solve command parameter parse problem
         and dereference null pointer problem