diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2018-01-15 16:42:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-16 15:01:33 -0500 |
commit | 96890d62523c2cddc2c053ad29de35c4d935cf11 (patch) | |
tree | c849442ebd9ae2f90531c8d127ec027790f5675d /net/core/net-procfs.c | |
parent | 868717ae73c5ad297b91fb52db1396f2336609a8 (diff) |
net: delete /proc THIS_MODULE references
/proc has been ignoring struct file_operations::owner field for 10 years.
Specifically, it started with commit 786d7e1612f0b0adb6046f19b906609e4fe8b1ba
("Fix rmmod/read/write races in /proc entries"). Notice the chunk where
inode->i_fop is initialized with proxy struct file_operations for
regular files:
- if (de->proc_fops)
- inode->i_fop = de->proc_fops;
+ if (de->proc_fops) {
+ if (S_ISREG(inode->i_mode))
+ inode->i_fop = &proc_reg_file_ops;
+ else
+ inode->i_fop = de->proc_fops;
+ }
VFS stopped pinning module at this point.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net-procfs.c')
-rw-r--r-- | net/core/net-procfs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c index 615ccab55f38..e010bb800d7b 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c | |||
@@ -182,7 +182,6 @@ static int dev_seq_open(struct inode *inode, struct file *file) | |||
182 | } | 182 | } |
183 | 183 | ||
184 | static const struct file_operations dev_seq_fops = { | 184 | static const struct file_operations dev_seq_fops = { |
185 | .owner = THIS_MODULE, | ||
186 | .open = dev_seq_open, | 185 | .open = dev_seq_open, |
187 | .read = seq_read, | 186 | .read = seq_read, |
188 | .llseek = seq_lseek, | 187 | .llseek = seq_lseek, |
@@ -202,7 +201,6 @@ static int softnet_seq_open(struct inode *inode, struct file *file) | |||
202 | } | 201 | } |
203 | 202 | ||
204 | static const struct file_operations softnet_seq_fops = { | 203 | static const struct file_operations softnet_seq_fops = { |
205 | .owner = THIS_MODULE, | ||
206 | .open = softnet_seq_open, | 204 | .open = softnet_seq_open, |
207 | .read = seq_read, | 205 | .read = seq_read, |
208 | .llseek = seq_lseek, | 206 | .llseek = seq_lseek, |
@@ -306,7 +304,6 @@ static int ptype_seq_open(struct inode *inode, struct file *file) | |||
306 | } | 304 | } |
307 | 305 | ||
308 | static const struct file_operations ptype_seq_fops = { | 306 | static const struct file_operations ptype_seq_fops = { |
309 | .owner = THIS_MODULE, | ||
310 | .open = ptype_seq_open, | 307 | .open = ptype_seq_open, |
311 | .read = seq_read, | 308 | .read = seq_read, |
312 | .llseek = seq_lseek, | 309 | .llseek = seq_lseek, |
@@ -387,7 +384,6 @@ static int dev_mc_seq_open(struct inode *inode, struct file *file) | |||
387 | } | 384 | } |
388 | 385 | ||
389 | static const struct file_operations dev_mc_seq_fops = { | 386 | static const struct file_operations dev_mc_seq_fops = { |
390 | .owner = THIS_MODULE, | ||
391 | .open = dev_mc_seq_open, | 387 | .open = dev_mc_seq_open, |
392 | .read = seq_read, | 388 | .read = seq_read, |
393 | .llseek = seq_lseek, | 389 | .llseek = seq_lseek, |