Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision af863d0df32b98f1005d2470e2de1d3e71a445e6)
+++ kernel/generic/include/ipc/ipc.h	(revision ddb0df58c37d07e66431a6471044949a96ecaf7d)
@@ -261,4 +261,10 @@
 	unative_t args[IPC_CALL_LEN];
 	phone_t *phone;
+	/*
+	 * The forward operation can masquerade the caller phone. For those
+	 * cases, we must keep it aside so that the answer is processed
+	 * correctly.
+	 */
+	phone_t *caller_phone;
 } ipc_data_t;