commit 6f8941e5bc20b3ba93a4700df8b0312c8ca1fc00
author Daniel Boulby <daniel.boulby@arm.com> Mon Jun 14 18:27:18 2021 +0100
committer Joao Alves <joao.alves@arm.com> Thu Jul 08 10:54:20 2021 +0200
tree cc36417e80ac5869f3e518e70394e24d596f5b9c
parent 55a189ef0cde44523ef1ef9d8a681b4ad79c8f95

fix(FF-A): Fix error code for FFA_RXTX_MAP

When mapping unaccessable memory return error code INVALID_PARAMETERS
instead of FFA_DENIED.

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: Idf62fd763be1e254ee15a4f5ca2c0ef543dcc1b3

src/api.c

diff --git a/src/api.c b/src/api.c
index 5d9e32f..250c78d 100644
--- a/src/api.c
+++ b/src/api.c
@@ -917,11 +917,10 @@
  *
  * Returns:
  *  - FFA_ERROR FFA_INVALID_PARAMETERS if the given addresses are not properly
- *    aligned or are the same.
+ *    aligned, are the same or have invalid attributes.
  *  - FFA_ERROR FFA_NO_MEMORY if the hypervisor was unable to map the buffers
  *    due to insuffient page table memory.
- *  - FFA_ERROR FFA_DENIED if the pages are already mapped or are not owned by
- *    the caller.
+ *  - FFA_ERROR FFA_DENIED if the pages are already mapped.
  *  - FFA_SUCCESS on success if no further action is needed.
  */
 
@@ -979,7 +978,7 @@
 	    !api_mode_valid_owned_and_exclusive(orig_send_mode) ||
 	    (orig_send_mode & MM_MODE_R) == 0 ||
 	    (orig_send_mode & MM_MODE_W) == 0) {
-		ret = ffa_error(FFA_DENIED);
+		ret = ffa_error(FFA_INVALID_PARAMETERS);
 		goto out;
 	}
 
@@ -987,7 +986,7 @@
 			    ipa_add(recv, PAGE_SIZE), &orig_recv_mode) ||
 	    !api_mode_valid_owned_and_exclusive(orig_recv_mode) ||
 	    (orig_recv_mode & MM_MODE_R) == 0) {
-		ret = ffa_error(FFA_DENIED);
+		ret = ffa_error(FFA_INVALID_PARAMETERS);
 		goto out;
 	}
 
@@ -1044,11 +1043,10 @@
  *
  * Returns:
  *  - FFA_ERROR FFA_INVALID_PARAMETERS if the given addresses are not properly
- *    aligned or are the same.
+ *    aligned, are the same or have invalid attributes.
  *  - FFA_ERROR FFA_NO_MEMORY if the hypervisor was unable to map the buffers
  *    due to insuffient page table memory.
- *  - FFA_ERROR FFA_DENIED if the pages are already mapped or are not owned by
- *    the caller.
+ *  - FFA_ERROR FFA_DENIED if the pages are already mapped.
  *  - FFA_SUCCESS on success if no further action is needed.
  *  - FFA_RX_RELEASE if it was called by the primary VM and the primary VM now
  *    needs to wake up or kick waiters.