Commit 13cfaf50 authored by Albert Cahalan's avatar Albert Cahalan Committed by Linus Torvalds

[PATCH] fix CONFIG_SECURE trouble in thread-aware procfs

This fixes the thread-aware /proc for CONFIG_SECURE.
parent 697569d8
...@@ -1196,8 +1196,10 @@ static struct file_operations proc_pid_attr_operations = { ...@@ -1196,8 +1196,10 @@ static struct file_operations proc_pid_attr_operations = {
.write = proc_pid_attr_write, .write = proc_pid_attr_write,
}; };
static struct file_operations proc_attr_operations; static struct file_operations proc_tid_attr_operations;
static struct inode_operations proc_attr_inode_operations; static struct inode_operations proc_tid_attr_inode_operations;
static struct file_operations proc_tgid_attr_operations;
static struct inode_operations proc_tgid_attr_inode_operations;
#endif #endif
/* SMP-safe */ /* SMP-safe */
...@@ -1304,10 +1306,14 @@ static struct dentry *proc_pident_lookup(struct inode *dir, ...@@ -1304,10 +1306,14 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
break; break;
#ifdef CONFIG_SECURITY #ifdef CONFIG_SECURITY
case PROC_TID_ATTR: case PROC_TID_ATTR:
inode->i_nlink = 2;
inode->i_op = &proc_tid_attr_inode_operations;
inode->i_fop = &proc_tid_attr_operations;
break;
case PROC_TGID_ATTR: case PROC_TGID_ATTR:
inode->i_nlink = 2; inode->i_nlink = 2;
inode->i_op = &proc_attr_inode_operations; inode->i_op = &proc_tgid_attr_inode_operations;
inode->i_fop = &proc_attr_operations; inode->i_fop = &proc_tgid_attr_operations;
break; break;
case PROC_TID_ATTR_CURRENT: case PROC_TID_ATTR_CURRENT:
case PROC_TGID_ATTR_CURRENT: case PROC_TGID_ATTR_CURRENT:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment