Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security subsystem updates from James Morris:
 "Generally pretty quiet for this release. Highlights:

  Yama:
   - allow ptrace access for original parent after re-parenting

  TPM:
   - add documentation
   - many bugfixes & cleanups
   - define a generic open() method for ascii & bios measurements

  Integrity:
   - Harden against malformed xattrs

  SELinux:
   - bugfixes & cleanups

  Smack:
   - Remove unnecessary smack_known_invalid label
   - Do not apply star label in smack_setprocattr hook
   - parse mnt opts after privileges check (fixes unpriv DoS vuln)"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (56 commits)
  Yama: allow access for the current ptrace parent
  tpm: adjust return value of tpm_read_log
  tpm: vtpm_proxy: conditionally call tpm_chip_unregister
  tpm: Fix handling of missing event log
  tpm: Check the bios_dir entry for NULL before accessing it
  tpm: return -ENODEV if np is not set
  tpm: cleanup of printk error messages
  tpm: replace of_find_node_by_name() with dev of_node property
  tpm: redefine read_log() to handle ACPI/OF at runtime
  tpm: fix the missing .owner in tpm_bios_measurements_ops
  tpm: have event log use the tpm_chip
  tpm: drop tpm1_chip_register(/unregister)
  tpm: replace dynamically allocated bios_dir with a static array
  tpm: replace symbolic permission with octal for securityfs files
  char: tpm: fix kerneldoc tpm2_unseal_trusted name typo
  tpm_tis: Allow tpm_tis to be bound using DT
  tpm, tpm_vtpm_proxy: add kdoc comments for VTPM_PROXY_IOC_NEW_DEV
  tpm: Only call pm_runtime_get_sync if device has a parent
  tpm: define a generic open() method for ascii & bios measurements
  Documentation: tpm: add the Physical TPM device tree binding documentation
  ...

1 files changed, 9 insertions, 14 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 9b99df4893a4..2e5b2e379cdf 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1667,7 +1667,8 @@ const struct inode_operations proc_pid_link_inode_operations = {
 
 /* building an inode */
 
-struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task)
+struct inode *proc_pid_make_inode(struct super_block * sb,
+                                  struct task_struct *task, umode_t mode)
 {
         struct inode * inode;
         struct proc_inode *ei;
@@ -1681,6 +1682,7 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
 
         /* Common stuff */
         ei = PROC_I(inode);
+        inode->i_mode = mode;
         inode->i_ino = get_next_ino();
         inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         inode->i_op = &proc_def_inode_operations;
@@ -2007,7 +2009,9 @@ proc_map_files_instantiate(struct inode *dir, struct dentry *dentry,
         struct proc_inode *ei;
         struct inode *inode;
 
-        inode = proc_pid_make_inode(dir->i_sb, task);
+        inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK |
+                                    ((mode & FMODE_READ ) ? S_IRUSR : 0) |
+                                    ((mode & FMODE_WRITE) ? S_IWUSR : 0));
         if (!inode)
                 return -ENOENT;
 
@@ -2016,12 +2020,6 @@ proc_map_files_instantiate(struct inode *dir, struct dentry *dentry,
 
         inode->i_op = &proc_map_files_link_inode_operations;
         inode->i_size = 64;
-        inode->i_mode = S_IFLNK;
-
-        if (mode & FMODE_READ)
-                inode->i_mode |= S_IRUSR;
-        if (mode & FMODE_WRITE)
-                inode->i_mode |= S_IWUSR;
 
         d_set_d_op(dentry, &tid_map_files_dentry_operations);
         d_add(dentry, inode);
@@ -2375,12 +2373,11 @@ static int proc_pident_instantiate(struct inode *dir,
         struct inode *inode;
         struct proc_inode *ei;
 
-        inode = proc_pid_make_inode(dir->i_sb, task);
+        inode = proc_pid_make_inode(dir->i_sb, task, p->mode);
         if (!inode)
                 goto out;
 
         ei = PROC_I(inode);
-        inode->i_mode = p->mode;
         if (S_ISDIR(inode->i_mode))
                 set_nlink(inode, 2);    /* Use getattr to fix if necessary */
         if (p->iop)
@@ -3062,11 +3059,10 @@ static int proc_pid_instantiate(struct inode *dir,
 {
         struct inode *inode;
 
-        inode = proc_pid_make_inode(dir->i_sb, task);
+        inode = proc_pid_make_inode(dir->i_sb, task, S_IFDIR | S_IRUGO | S_IXUGO);
         if (!inode)
                 goto out;
 
-        inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
         inode->i_op = &proc_tgid_base_inode_operations;
         inode->i_fop = &proc_tgid_base_operations;
         inode->i_flags|=S_IMMUTABLE;
@@ -3354,11 +3350,10 @@ static int proc_task_instantiate(struct inode *dir,
         struct dentry *dentry, struct task_struct *task, const void *ptr)
 {
         struct inode *inode;
-        inode = proc_pid_make_inode(dir->i_sb, task);
+        inode = proc_pid_make_inode(dir->i_sb, task, S_IFDIR | S_IRUGO | S_IXUGO);
 
         if (!inode)
                 goto out;
-        inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
         inode->i_op = &proc_tid_base_inode_operations;
         inode->i_fop = &proc_tid_base_operations;
         inode->i_flags|=S_IMMUTABLE;