1 files changed, 9 insertions, 1 deletions

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index c22b32fc8e8c..e8ba6278ad2c 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -243,7 +243,8 @@ unlock:
  * userspace. Returns zero upon delivery to desired context element;
  * non-zero upon delivery failure or error.
  */
-int ecryptfs_process_response(struct ecryptfs_message *msg, pid_t pid, u32 seq)
+int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t uid,
+                              pid_t pid, u32 seq)
 {
         struct ecryptfs_daemon_id *id;
         struct ecryptfs_msg_ctx *msg_ctx;
@@ -268,6 +269,13 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, pid_t pid, u32 seq)
                                 msg_ctx->task->euid, pid);
                 goto wake_up;
         }
+        if (msg_ctx->task->euid != uid) {
+                rc = -EBADMSG;
+                ecryptfs_printk(KERN_WARNING, "Received message from user "
+                                "[%d]; expected message from user [%d]\n",
+                                uid, msg_ctx->task->euid);
+                goto unlock;
+        }
         if (id->pid != pid) {
                 rc = -EBADMSG;
                 ecryptfs_printk(KERN_ERR, "User [%d] received a "