Skip to content

Commit 5e876fb

Browse files
sargunChristian Brauner
authored andcommitted
vfs, fdtable: Add fget_task helper
This introduces a function which can be used to fetch a file, given an arbitrary task. As long as the user holds a reference (refcnt) to the task_struct it is safe to call, and will either return NULL on failure, or a pointer to the file, with a refcnt. This patch is based on Oleg Nesterov's (cf. [1]) patch from September 2018. [1]: Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sargun Dhillon <[email protected]> Suggested-by: Oleg Nesterov <[email protected]> Acked-by: Christian Brauner <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent c79f46a commit 5e876fb

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

fs/file.c

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,9 +706,9 @@ void do_close_on_exec(struct files_struct *files)
706706
spin_unlock(&files->file_lock);
707707
}
708708

709-
static struct file *__fget(unsigned int fd, fmode_t mask, unsigned int refs)
709+
static struct file *__fget_files(struct files_struct *files, unsigned int fd,
710+
fmode_t mask, unsigned int refs)
710711
{
711-
struct files_struct *files = current->files;
712712
struct file *file;
713713

714714
rcu_read_lock();
@@ -729,6 +729,12 @@ static struct file *__fget(unsigned int fd, fmode_t mask, unsigned int refs)
729729
return file;
730730
}
731731

732+
static inline struct file *__fget(unsigned int fd, fmode_t mask,
733+
unsigned int refs)
734+
{
735+
return __fget_files(current->files, fd, mask, refs);
736+
}
737+
732738
struct file *fget_many(unsigned int fd, unsigned int refs)
733739
{
734740
return __fget(fd, FMODE_PATH, refs);
@@ -746,6 +752,18 @@ struct file *fget_raw(unsigned int fd)
746752
}
747753
EXPORT_SYMBOL(fget_raw);
748754

755+
struct file *fget_task(struct task_struct *task, unsigned int fd)
756+
{
757+
struct file *file = NULL;
758+
759+
task_lock(task);
760+
if (task->files)
761+
file = __fget_files(task->files, fd, 0, 1);
762+
task_unlock(task);
763+
764+
return file;
765+
}
766+
749767
/*
750768
* Lightweight file lookup - no refcnt increment if fd table isn't shared.
751769
*

include/linux/file.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ extern void fput(struct file *);
1616
extern void fput_many(struct file *, unsigned int);
1717

1818
struct file_operations;
19+
struct task_struct;
1920
struct vfsmount;
2021
struct dentry;
2122
struct inode;
@@ -47,6 +48,7 @@ static inline void fdput(struct fd fd)
4748
extern struct file *fget(unsigned int fd);
4849
extern struct file *fget_many(unsigned int fd, unsigned int refs);
4950
extern struct file *fget_raw(unsigned int fd);
51+
extern struct file *fget_task(struct task_struct *task, unsigned int fd);
5052
extern unsigned long __fdget(unsigned int fd);
5153
extern unsigned long __fdget_raw(unsigned int fd);
5254
extern unsigned long __fdget_pos(unsigned int fd);

0 commit comments

Comments
 (0)