Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'driver-core-6.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull debugfs fix from Greg KH:
"Here is a single debugfs fix from Al to resolve a reported regression
in the driver-core tree. It has been reported to fix the issue"
* tag 'driver-core-6.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
debugfs: Fix the missing initializations in __debugfs_file_get()
+12
-8
+12
-8
fs/debugfs/file.c
+12
-8
fs/debugfs/file.c
···
94
94
fsd = d_fsd;
95
95
} else {
96
96
struct inode *inode = dentry->d_inode;
97
+
unsigned int methods = 0;
97
98
98
99
if (WARN_ON(mode == DBGFS_GET_ALREADY))
99
100
return -EINVAL;
···
107
106
const struct debugfs_short_fops *ops;
108
107
ops = fsd->short_fops = DEBUGFS_I(inode)->short_fops;
109
108
if (ops->llseek)
110
-
fsd->methods |= HAS_LSEEK;
109
+
methods |= HAS_LSEEK;
111
110
if (ops->read)
112
-
fsd->methods |= HAS_READ;
111
+
methods |= HAS_READ;
113
112
if (ops->write)
114
-
fsd->methods |= HAS_WRITE;
113
+
methods |= HAS_WRITE;
114
+
fsd->real_fops = NULL;
115
115
} else {
116
116
const struct file_operations *ops;
117
117
ops = fsd->real_fops = DEBUGFS_I(inode)->real_fops;
118
118
if (ops->llseek)
119
-
fsd->methods |= HAS_LSEEK;
119
+
methods |= HAS_LSEEK;
120
120
if (ops->read)
121
-
fsd->methods |= HAS_READ;
121
+
methods |= HAS_READ;
122
122
if (ops->write)
123
-
fsd->methods |= HAS_WRITE;
123
+
methods |= HAS_WRITE;
124
124
if (ops->unlocked_ioctl)
125
-
fsd->methods |= HAS_IOCTL;
125
+
methods |= HAS_IOCTL;
126
126
if (ops->poll)
127
-
fsd->methods |= HAS_POLL;
127
+
methods |= HAS_POLL;
128
+
fsd->short_fops = NULL;
128
129
}
130
+
fsd->methods = methods;
129
131
refcount_set(&fsd->active_users, 1);
130
132
init_completion(&fsd->active_users_drained);
131
133
INIT_LIST_HEAD(&fsd->cancellations);