3 files changed, 38 insertions, 1 deletions

diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 85e5dc0431fe..abf4a2529f80 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -139,6 +139,31 @@ void proc_id_connector(struct task_struct *task, int which_id)
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
+void proc_sid_connector(struct task_struct *task)
+{
+        struct cn_msg *msg;
+        struct proc_event *ev;
+        struct timespec ts;
+        __u8 buffer[CN_PROC_MSG_SIZE];
+
+        if (atomic_read(&proc_event_num_listeners) < 1)
+                return;
+
+        msg = (struct cn_msg *)buffer;
+        ev = (struct proc_event *)msg->data;
+        get_seq(&msg->seq, &ev->cpu);
+        ktime_get_ts(&ts); /* get high res monotonic timestamp */
+        put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+        ev->what = PROC_EVENT_SID;
+        ev->event_data.sid.process_pid = task->pid;
+        ev->event_data.sid.process_tgid = task->tgid;
+
+        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+        msg->ack = 0; /* not used */
+        msg->len = sizeof(*ev);
+        cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+}
+
 void proc_exit_connector(struct task_struct *task)
 {
         struct cn_msg *msg;
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index b8125b2eb665..47dac5ea8d3a 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -52,6 +52,7 @@ struct proc_event {
                 PROC_EVENT_EXEC = 0x00000002,
                 PROC_EVENT_UID  = 0x00000004,
                 PROC_EVENT_GID  = 0x00000040,
+                PROC_EVENT_SID  = 0x00000080,
                 /* "next" should be 0x00000400 */
                 /* "last" is the last process event: exit */
                 PROC_EVENT_EXIT = 0x80000000
@@ -89,6 +90,11 @@ struct proc_event {
                         } e;
                 } id;
 
+                struct sid_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                } sid;
+
                 struct exit_proc_event {
                         __kernel_pid_t process_pid;
                         __kernel_pid_t process_tgid;
@@ -102,6 +108,7 @@ struct proc_event {
 void proc_fork_connector(struct task_struct *task);
 void proc_exec_connector(struct task_struct *task);
 void proc_id_connector(struct task_struct *task, int which_id);
+void proc_sid_connector(struct task_struct *task);
 void proc_exit_connector(struct task_struct *task);
 #else
 static inline void proc_fork_connector(struct task_struct *task)
@@ -114,6 +121,9 @@ static inline void proc_id_connector(struct task_struct *task,
                                      int which_id)
 {}
 
+static inline void proc_sid_connector(struct task_struct *task)
+{}
+
 static inline void proc_exit_connector(struct task_struct *task)
 {}
 #endif  /* CONFIG_PROC_EVENTS */
diff --git a/kernel/exit.c b/kernel/exit.c
index e47ee8a06135..61bb1761c7b8 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -359,8 +359,10 @@ void __set_special_pids(struct pid *pid)
 {
         struct task_struct *curr = current->group_leader;
 
-        if (task_session(curr) != pid)
+        if (task_session(curr) != pid) {
                 change_pid(curr, PIDTYPE_SID, pid);
+                proc_sid_connector(curr);
+        }
 
         if (task_pgrp(curr) != pid)
                 change_pid(curr, PIDTYPE_PGID, pid);