aboutsummaryrefslogtreecommitdiffstats
path: root/fs/file_table.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-14 10:56:20 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:11 -0400
commitdd20908a8a06b22c171f6c3fcdbdbd65bed07505 (patch)
tree447e2df881b2f056608098d3b24ab6d9734ce992 /fs/file_table.c
parent44ba8406d0005400e56c6b6a279a669eb761d1b8 (diff)
don't bother with {get,put}_write_access() on non-regular files
it's pointless and actually leads to wrong behaviour in at least one moderately convoluted case (pipe(), close one end, try to get to another via /proc/*/fd and run into ETXTBUSY). Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/file_table.c')
-rw-r--r--fs/file_table.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 5b24008ea4f6..79ecae62209a 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -209,10 +209,10 @@ static void drop_file_write_access(struct file *file)
209 struct dentry *dentry = file->f_path.dentry; 209 struct dentry *dentry = file->f_path.dentry;
210 struct inode *inode = dentry->d_inode; 210 struct inode *inode = dentry->d_inode;
211 211
212 put_write_access(inode);
213
214 if (special_file(inode->i_mode)) 212 if (special_file(inode->i_mode))
215 return; 213 return;
214
215 put_write_access(inode);
216 if (file_check_writeable(file) != 0) 216 if (file_check_writeable(file) != 0)
217 return; 217 return;
218 __mnt_drop_write(mnt); 218 __mnt_drop_write(mnt);