diff --git a/SOURCES/opencryptoki-3.18.0-returning_CKR_BUFFER_TOO_SMALL.patch b/SOURCES/opencryptoki-3.18.0-returning_CKR_BUFFER_TOO_SMALL.patch
new file mode 100644
index 0000000..9dbbb74
--- /dev/null
+++ b/SOURCES/opencryptoki-3.18.0-returning_CKR_BUFFER_TOO_SMALL.patch
@@ -0,0 +1,32 @@
+commit b545050b338e46c29936a2748aab7200e69a5c91
+Author: Ingo Franzki <ifranzki@linux.ibm.com>
+Date:   Tue Jul 26 15:11:06 2022 +0200
+
+    EP11: Fix C_GetMechanismList returning CKR_BUFFER_TOO_SMALL
+    
+    For mixed card levels, the size query call and the call to obtain the
+    list may run on different cards. When the size query call runs on a
+    card with less mechanisms than the second call, will fail, but it
+    returns the larger larger number of mechanisms.
+    
+    The code already re-allocates the buffer for retrieving the mechanism
+    list, but does not return the larger number in pulCount. This will
+    lead to a CKR_BUFFER_TOO_SMALL when the application calls C_GetMechanismList
+    again to obtain the list of mechanisms, because the applications buffer
+    is too small.
+    
+    Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
+
+diff --git a/usr/lib/ep11_stdll/ep11_specific.c b/usr/lib/ep11_stdll/ep11_specific.c
+index 8d796452..1629e664 100644
+--- a/usr/lib/ep11_stdll/ep11_specific.c
++++ b/usr/lib/ep11_stdll/ep11_specific.c
+@@ -8977,6 +8977,8 @@ CK_RV ep11tok_get_mechanism_list(STDLL_TokData_t * tokdata,
+                 if (rc != CKR_BUFFER_TOO_SMALL)
+                     goto out;
+             }
++            /* counter was updated in case of CKR_BUFFER_TOO_SMALL */
++            *pulCount = counter;
+         } while (rc == CKR_BUFFER_TOO_SMALL);
+ 
+         for (i = 0; i < counter; i++) {
diff --git a/SPECS/opencryptoki.spec b/SPECS/opencryptoki.spec
index dbeb2d4..4bfc84d 100644
--- a/SPECS/opencryptoki.spec
+++ b/SPECS/opencryptoki.spec
@@ -1,7 +1,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v3.0
 Version:		3.17.0
-Release:		6%{?dist}
+Release:		7%{?dist}
 License:		CPL
 URL:			https://github.com/opencryptoki/opencryptoki
 Source0:		https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch301: opencryptoki-3.17.0-unlock-globmutex-if-user-and-group-check-fail.patc
 Patch302: opencryptoki-3.17-libica4-8e9800b492f7a40ed5dfcd85e042701b6a5c5a26.patch
 Patch303: 0001-EP11-Dilithium-Specify-OID-of-key-strength-at-key-ge.patch
 Patch304: 0002-EP11-Fix-host-library-version-query.patch
+Patch305: opencryptoki-3.18.0-returning_CKR_BUFFER_TOO_SMALL.patch
 
 Requires(pre):		coreutils
 Requires: 		(selinux-policy >= 34.1.8-1 if selinux-policy-targeted)
@@ -322,6 +323,9 @@ fi
 
 
 %changelog
+* Wed Aug 03 2022 Than Ngo <than@redhat.com> - 3.17.0-7
+- Resolves: #2114913, EP11: Fix C_GetMechanismList returning CKR_BUFFER_TOO_SMALL
+
 * Tue May 03 2022 Than Ngo <than@redhat.com> - 3.17.0-6
 - Resolves: #2081355, Dilithium support not available