Skip to content

Commit

Permalink
Revert "proc: Pass file mode to proc_pid_make_inode"
Browse files Browse the repository at this point in the history 
We have it already at bc6c441.

This reverts commit 891160f.
  • Loading branch information
@jjpprrrr @Kyuofox
jjpprrrr authored and Kyuofox committed Aug 29, 2022
1 parent cbcc4b2 commit b552d86
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 14 deletions.
23 changes: 14 additions & 9 deletions fs/proc/base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1875,8 +1875,7 @@ 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, umode_t mode)
struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task)
{
struct inode * inode;
struct proc_inode *ei;
Expand All @@ -1890,7 +1889,6 @@ struct inode *proc_pid_make_inode(struct super_block * sb,

/* 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;
Expand Down Expand Up @@ -2242,9 +2240,7 @@ 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, S_IFLNK |
((mode & FMODE_READ ) ? S_IRUSR : 0) |
((mode & FMODE_WRITE) ? S_IWUSR : 0));
inode = proc_pid_make_inode(dir->i_sb, task);
if (!inode)
return -ENOENT;

Expand All @@ -2253,6 +2249,12 @@ 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);
Expand Down Expand Up @@ -2606,11 +2608,12 @@ static int proc_pident_instantiate(struct inode *dir,
struct inode *inode;
struct proc_inode *ei;

inode = proc_pid_make_inode(dir->i_sb, task, p->mode);
inode = proc_pid_make_inode(dir->i_sb, task);
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)
Expand Down Expand Up @@ -3378,10 +3381,11 @@ static int proc_pid_instantiate(struct inode *dir,
{
struct inode *inode;

inode = proc_pid_make_inode(dir->i_sb, task, S_IFDIR | S_IRUGO | S_IXUGO);
inode = proc_pid_make_inode(dir->i_sb, task);
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;
Expand Down Expand Up @@ -3680,10 +3684,11 @@ 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, S_IFDIR | S_IRUGO | S_IXUGO);
inode = proc_pid_make_inode(dir->i_sb, task);

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;
Expand Down
6 changes: 4 additions & 2 deletions fs/proc/fd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,14 @@ proc_fd_instantiate(struct inode *dir, struct dentry *dentry,
struct proc_inode *ei;
struct inode *inode;

inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK);
inode = proc_pid_make_inode(dir->i_sb, task);
if (!inode)
goto out;

ei = PROC_I(inode);
ei->fd = fd;

inode->i_mode = S_IFLNK;
inode->i_op = &proc_pid_link_inode_operations;
inode->i_size = 64;

Expand Down Expand Up @@ -321,13 +322,14 @@ proc_fdinfo_instantiate(struct inode *dir, struct dentry *dentry,
struct proc_inode *ei;
struct inode *inode;

inode = proc_pid_make_inode(dir->i_sb, task, S_IFREG | S_IRUSR);
inode = proc_pid_make_inode(dir->i_sb, task);
if (!inode)
goto out;

ei = PROC_I(inode);
ei->fd = fd;

inode->i_mode = S_IFREG | S_IRUSR;
inode->i_fop = &proc_fdinfo_file_operations;

d_set_d_op(dentry, &tid_fd_dentry_operations);
Expand Down
2 changes: 1 addition & 1 deletion fs/proc/internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
extern const struct dentry_operations pid_dentry_operations;
extern int pid_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int proc_setattr(struct dentry *, struct iattr *);
extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t);
extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *);
extern int pid_revalidate(struct dentry *, unsigned int);
extern int pid_delete_dentry(const struct dentry *);
extern int proc_pid_readdir(struct file *, struct dir_context *);
Expand Down
3 changes: 2 additions & 1 deletion fs/proc/namespaces.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ static int proc_ns_instantiate(struct inode *dir,
struct inode *inode;
struct proc_inode *ei;

inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK | S_IRWXUGO);
inode = proc_pid_make_inode(dir->i_sb, task);
if (!inode)
goto out;

ei = PROC_I(inode);
inode->i_mode = S_IFLNK|S_IRWXUGO;
inode->i_op = &proc_ns_link_inode_operations;
ei->ns_ops = ns_ops;

Expand Down
1 change: 0 additions & 1 deletion security/selinux/hooks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4046,7 +4046,6 @@ static void selinux_task_to_inode(struct task_struct *p,
struct inode_security_struct *isec = inode->i_security;
u32 sid = task_sid(p);

isec->sclass = inode_mode_to_security_class(inode->i_mode);
isec->sid = sid;
isec->initialized = LABEL_INITIALIZED;
}
Expand Down

0 comments on commit b552d86

Please sign in to comment.