Merge branch 'late/board' into devel-late

[pandora-kernel.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 28bd64d..a2757d4 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -66,6 +66,7 @@ struct mqueue_inode_info {
 
        struct sigevent notify;
        struct pid* notify_owner;
+       struct user_namespace *notify_user_ns;
        struct user_struct *user;       /* user who created, for accounting */
        struct sock *notify_sock;
        struct sk_buff *notify_cookie;
@@ -139,6 +140,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
                INIT_LIST_HEAD(&info->e_wait_q[0].list);
                INIT_LIST_HEAD(&info->e_wait_q[1].list);
                info->notify_owner = NULL;
+               info->notify_user_ns = NULL;
                info->qsize = 0;
                info->user = NULL;      /* set when all is ok */
                memset(&info->attr, 0, sizeof(info->attr));
@@ -249,7 +251,7 @@ static void mqueue_evict_inode(struct inode *inode)
        int i;
        struct ipc_namespace *ipc_ns;
 
-       end_writeback(inode);
+       clear_inode(inode);
 
        if (S_ISDIR(inode->i_mode))
                return;
@@ -536,8 +538,7 @@ static void __do_notify(struct mqueue_inode_info *info)
                        rcu_read_lock();
                        sig_i.si_pid = task_tgid_nr_ns(current,
                                                ns_of_pid(info->notify_owner));
-                       sig_i.si_uid = user_ns_map_uid(info->user->user_ns,
-                                               current_cred(), current_uid());
+                       sig_i.si_uid = from_kuid_munged(info->notify_user_ns, current_uid());
                        rcu_read_unlock();
 
                        kill_pid_info(info->notify.sigev_signo,
@@ -550,7 +551,9 @@ static void __do_notify(struct mqueue_inode_info *info)
                }
                /* after notification unregisters process */
                put_pid(info->notify_owner);
+               put_user_ns(info->notify_user_ns);
                info->notify_owner = NULL;
+               info->notify_user_ns = NULL;
        }
        wake_up(&info->wait_q);
 }
@@ -575,7 +578,9 @@ static void remove_notification(struct mqueue_inode_info *info)
                netlink_sendskb(info->notify_sock, info->notify_cookie);
        }
        put_pid(info->notify_owner);
+       put_user_ns(info->notify_user_ns);
        info->notify_owner = NULL;
+       info->notify_user_ns = NULL;
 }
 
 static int mq_attr_ok(struct ipc_namespace *ipc_ns, struct mq_attr *attr)
@@ -1140,6 +1145,7 @@ retry:
                }
 
                info->notify_owner = get_pid(task_tgid(current));
+               info->notify_user_ns = get_user_ns(current_user_ns());
                inode->i_atime = inode->i_ctime = CURRENT_TIME;
        }
        spin_unlock(&info->lock);