diff options
| author | Jan Kara <jack@suse.cz> | 2016-10-04 13:44:06 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:50:53 +0000 |
| commit | 1749060166c3a4b770fdfcb965429a9dda00f4cd (patch) | |
| tree | 3155f4f5e694370dd6bcf4f1b2db63d42d54de01 /fs | |
| parent | ff9c51e4116265a325ea286c3c9faab88489a9f6 (diff) | |
| download | linux-stable-1749060166c3a4b770fdfcb965429a9dda00f4cd.tar.gz linux-stable-1749060166c3a4b770fdfcb965429a9dda00f4cd.tar.bz2 linux-stable-1749060166c3a4b770fdfcb965429a9dda00f4cd.zip | |
isofs: Do not return EACCES for unknown filesystems
commit a2ed0b391dd9c3ef1d64c7c3e370f4a5ffcd324a upstream.
When isofs_mount() is called to mount a device read-write, it returns
EACCES even before it checks that the device actually contains an isofs
filesystem. This may confuse mount(8) which then tries to mount all
subsequent filesystem types in read-only mode.
Fix the problem by returning EACCES only once we verify that the device
indeed contains an iso9660 filesystem.
Fixes: 17b7f7cf58926844e1dd40f5eb5348d481deca6a
Reported-by: Kent Overstreet <kent.overstreet@gmail.com>
Reported-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/isofs/inode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 2f9197f5ba02..e5657200eadd 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -717,6 +717,11 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) pri_bh = NULL; root_found: + /* We don't support read-write mounts */ + if (!(s->s_flags & MS_RDONLY)) { + error = -EACCES; + goto out_freebh; + } if (joliet_level && (pri == NULL || !opt.rock)) { /* This is the case of Joliet with the norock mount flag. @@ -1527,9 +1532,6 @@ struct inode *__isofs_iget(struct super_block *sb, static struct dentry *isofs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { - /* We don't support read-write mounts */ - if (!(flags & MS_RDONLY)) - return ERR_PTR(-EACCES); return mount_bdev(fs_type, flags, dev_name, data, isofs_fill_super); } |