Merge pull request usbarmory#12 from fabioestevam/master

caam_keyblob: Fix the caam_jr_enqueue() return value check
jereviikari · Nov 3, 2021 · 18593cf · 18593cf
2 parents 2e303fa + c492f4b
commit 18593cf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/caam_keyblob.c b/caam_keyblob.c
@@ -412,7 +412,8 @@ static int gen_mem_encap(struct device *jr_dev, void __user *secretbuf,
 
 	retval = caam_jr_enqueue(jr_dev, encapdesc, sm_key_job_done,
 			&testres);
-	if (!retval) {
+	if (retval == 0 || retval == -EINPROGRESS) {
+		retval = 0;
 		wait_for_completion_interruptible(&testres.completion);
 
 		if (testres.error) {
@@ -512,7 +513,8 @@ static int gen_mem_decap(struct device *jr_dev, void __user *keyblobbuf,
 
 	retval = caam_jr_enqueue(jr_dev, decapdesc, sm_key_job_done,
 			&testres);
-	if (!retval) {
+	if (retval == 0 || retval == -EINPROGRESS) {
+		retval = 0;
 		wait_for_completion_interruptible(&testres.completion);
 
 		if (testres.error) {