diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 08:43:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 08:43:59 -0700 |
| commit | f920bb6f5fe21047e669381fe4dd346f6a9d3562 (patch) | |
| tree | d38ee255046f23e15dd4c138864386c57759ceed | |
| parent | d32466912ea1f5a0ced568c4884f6c7d335ea969 (diff) | |
| parent | 1e0bd7550ea9cf474b1ad4c6ff5729a507f75fdc (diff) | |
| download | linux-3.10-f920bb6f5fe21047e669381fe4dd346f6a9d3562.tar.gz linux-3.10-f920bb6f5fe21047e669381fe4dd346f6a9d3562.tar.bz2 linux-3.10-f920bb6f5fe21047e669381fe4dd346f6a9d3562.zip | |
Merge branch 'audit.b49' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b49' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] export sessionid alongside the loginuid in procfs
| -rw-r--r-- | fs/proc/base.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 9a4da0aae02..8a10f6fe24a 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1036,6 +1036,26 @@ static const struct file_operations proc_loginuid_operations = { .read = proc_loginuid_read, .write = proc_loginuid_write, }; + +static ssize_t proc_sessionid_read(struct file * file, char __user * buf, + size_t count, loff_t *ppos) +{ + struct inode * inode = file->f_path.dentry->d_inode; + struct task_struct *task = get_proc_task(inode); + ssize_t length; + char tmpbuf[TMPBUFLEN]; + + if (!task) + return -ESRCH; + length = scnprintf(tmpbuf, TMPBUFLEN, "%u", + audit_get_sessionid(task)); + put_task_struct(task); + return simple_read_from_buffer(buf, count, ppos, tmpbuf, length); +} + +static const struct file_operations proc_sessionid_operations = { + .read = proc_sessionid_read, +}; #endif #ifdef CONFIG_FAULT_INJECTION @@ -2319,6 +2339,7 @@ static const struct pid_entry tgid_base_stuff[] = { REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, loginuid), + REG("sessionid", S_IRUSR, sessionid), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, fault_inject), @@ -2649,6 +2670,7 @@ static const struct pid_entry tid_base_stuff[] = { REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, loginuid), + REG("sessionid", S_IRUSR, sessionid), #endif #ifdef CONFIG_FAULT_INJECTION REG("make-it-fail", S_IRUGO|S_IWUSR, fault_inject), |