1 files changed, 57 insertions, 15 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index a23651ce6960..5ab1849971b4 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -140,9 +140,13 @@ struct pid_entry {
 #define REG(NAME, MODE, fops)                           \
         NOD(NAME, (S_IFREG|(MODE)), NULL, &fops, {})
 #define ONE(NAME, MODE, show)                           \
-        NOD(NAME, (S_IFREG|(MODE)),                     \
+        NOD(NAME, (S_IFREG|(MODE)),                     \
                 NULL, &proc_single_file_operations,     \
                 { .proc_show = show } )
+#define ATTR(LSM, NAME, MODE)                           \
+        NOD(NAME, (S_IFREG|(MODE)),                     \
+                NULL, &proc_pid_attr_operations,        \
+                { .lsm = LSM })
 
 /*
  * Count the number of hardlinks for the pid_entry table, excluding the .
@@ -456,7 +460,7 @@ static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns,
                               struct pid *pid, struct task_struct *task)
 {
         if (unlikely(!sched_info_on()))
-                seq_printf(m, "0 0 0\n");
+                seq_puts(m, "0 0 0\n");
         else
                 seq_printf(m, "%llu %llu %lu\n",
                    (unsigned long long)task->se.sum_exec_runtime,
@@ -1086,10 +1090,6 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy)
 
                         task_lock(p);
                         if (!p->vfork_done && process_shares_mm(p, mm)) {
-                                pr_info("updating oom_score_adj for %d (%s) from %d to %d because it shares mm with %d (%s). Report if this is unexpected.\n",
-                                                task_pid_nr(p), p->comm,
-                                                p->signal->oom_score_adj, oom_adj,
-                                                task_pid_nr(task), task->comm);
                                 p->signal->oom_score_adj = oom_adj;
                                 if (!legacy && has_capability_noaudit(current, CAP_SYS_RESOURCE))
                                         p->signal->oom_score_adj_min = (short)oom_adj;
@@ -2525,7 +2525,7 @@ static ssize_t proc_pid_attr_read(struct file * file, char __user * buf,
         if (!task)
                 return -ESRCH;
 
-        length = security_getprocattr(task,
+        length = security_getprocattr(task, PROC_I(inode)->op.lsm,
                                       (char*)file->f_path.dentry->d_name.name,
                                       &p);
         put_task_struct(task);
@@ -2574,7 +2574,9 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf,
         if (rv < 0)
                 goto out_free;
 
-        rv = security_setprocattr(file->f_path.dentry->d_name.name, page, count);
+        rv = security_setprocattr(PROC_I(inode)->op.lsm,
+                                  file->f_path.dentry->d_name.name, page,
+                                  count);
         mutex_unlock(&current->signal->cred_guard_mutex);
 out_free:
         kfree(page);
@@ -2588,13 +2590,53 @@ static const struct file_operations proc_pid_attr_operations = {
         .llseek         = generic_file_llseek,
 };
 
+#define LSM_DIR_OPS(LSM) \
+static int proc_##LSM##_attr_dir_iterate(struct file *filp, \
+                             struct dir_context *ctx) \
+{ \
+        return proc_pident_readdir(filp, ctx, \
+                                   LSM##_attr_dir_stuff, \
+                                   ARRAY_SIZE(LSM##_attr_dir_stuff)); \
+} \
+\
+static const struct file_operations proc_##LSM##_attr_dir_ops = { \
+        .read           = generic_read_dir, \
+        .iterate        = proc_##LSM##_attr_dir_iterate, \
+        .llseek         = default_llseek, \
+}; \
+\
+static struct dentry *proc_##LSM##_attr_dir_lookup(struct inode *dir, \
+                                struct dentry *dentry, unsigned int flags) \
+{ \
+        return proc_pident_lookup(dir, dentry, \
+                                  LSM##_attr_dir_stuff, \
+                                  ARRAY_SIZE(LSM##_attr_dir_stuff)); \
+} \
+\
+static const struct inode_operations proc_##LSM##_attr_dir_inode_ops = { \
+        .lookup         = proc_##LSM##_attr_dir_lookup, \
+        .getattr        = pid_getattr, \
+        .setattr        = proc_setattr, \
+}
+
+#ifdef CONFIG_SECURITY_SMACK
+static const struct pid_entry smack_attr_dir_stuff[] = {
+        ATTR("smack", "current",        0666),
+};
+LSM_DIR_OPS(smack);
+#endif
+
 static const struct pid_entry attr_dir_stuff[] = {
-        REG("current",    S_IRUGO|S_IWUGO, proc_pid_attr_operations),
-        REG("prev",       S_IRUGO,         proc_pid_attr_operations),
-        REG("exec",       S_IRUGO|S_IWUGO, proc_pid_attr_operations),
-        REG("fscreate",   S_IRUGO|S_IWUGO, proc_pid_attr_operations),
-        REG("keycreate",  S_IRUGO|S_IWUGO, proc_pid_attr_operations),
-        REG("sockcreate", S_IRUGO|S_IWUGO, proc_pid_attr_operations),
+        ATTR(NULL, "current",           0666),
+        ATTR(NULL, "prev",              0444),
+        ATTR(NULL, "exec",              0666),
+        ATTR(NULL, "fscreate",          0666),
+        ATTR(NULL, "keycreate",         0666),
+        ATTR(NULL, "sockcreate",        0666),
+#ifdef CONFIG_SECURITY_SMACK
+        DIR("smack",                    0555,
+            proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),
+#endif
 };
 
 static int proc_attr_dir_readdir(struct file *file, struct dir_context *ctx)
@@ -3165,7 +3207,7 @@ static struct dentry *proc_pid_instantiate(struct dentry * dentry,
         return d_splice_alias(inode, dentry);
 }
 
-struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
+struct dentry *proc_pid_lookup(struct dentry *dentry, unsigned int flags)
 {
         struct task_struct *task;
         unsigned tgid;