summaryrefslogtreecommitdiffstats
path: root/fs/proc/base.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-21 10:56:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-21 10:56:05 +0200
commitcfb0276373dfb5dccef0f60df0d1f7c0328918a7 (patch)
tree65c96cea2a3463baa2eb91351e5333ef44945fbd /fs/proc/base.c
parent04d72afa34edd14d99db7536d22819cdbb2b2e4c (diff)
parent13311e74253fe64329390df80bed3f07314ddd61 (diff)
downloadlinux-cfb0276373dfb5dccef0f60df0d1f7c0328918a7.tar.bz2
Merge tag 'v5.13-rc7' into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r--fs/proc/base.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 7118ebe38fa6..9cbd915025ad 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2676,7 +2676,9 @@ out:
#ifdef CONFIG_SECURITY
static int proc_pid_attr_open(struct inode *inode, struct file *file)
{
- return __mem_open(inode, file, PTRACE_MODE_READ_FSCREDS);
+ file->private_data = NULL;
+ __mem_open(inode, file, PTRACE_MODE_READ_FSCREDS);
+ return 0;
}
static ssize_t proc_pid_attr_read(struct file * file, char __user * buf,