]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
udf: fix ioctl errors
authorFabian Frederick <fabf@skynet.be>
Tue, 24 Jan 2017 20:48:34 +0000 (21:48 +0100)
committerJan Kara <jack@suse.cz>
Fri, 3 Feb 2017 15:19:54 +0000 (16:19 +0100)
Currently, lsattr for instance in udf directory gives
"udf: Invalid argument While reading flags on ..."

This patch returns -ENOIOCTLCMD
when command is unknown to have more accurate message like this:
"Inappropriate ioctl for device While reading flags on ..."

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/file.c

index dbcb3a4a0cb99ca261774767230bd2af77233640..87551b77933a20656b0316853aee165fb4a5b239 100644 (file)
@@ -184,7 +184,8 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                goto out;
        }
 
-       if (!arg) {
+       if (!arg && ((cmd == UDF_GETVOLIDENT) || (cmd == UDF_GETEASIZE) ||
+                    (cmd == UDF_RELOCATE_BLOCKS) || (cmd == UDF_GETEABLOCK))) {
                udf_debug("invalid argument to udf_ioctl\n");
                result = -EINVAL;
                goto out;
@@ -220,6 +221,8 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                                      UDF_I(inode)->i_ext.i_data,
                                      UDF_I(inode)->i_lenEAttr) ? -EFAULT : 0;
                goto out;
+       default:
+               return -ENOIOCTLCMD;
        }
 
 out: