diff options
| author | Bartosz Golaszewski <[email protected]> | 2024-11-04 07:46:55 +0000 |
|---|---|---|
| committer | Bartosz Golaszewski <[email protected]> | 2024-11-04 07:46:55 +0000 |
| commit | a7a86fe18b9a3c1e3f2c0b4687bf53cc2b9f9f88 (patch) | |
| tree | 3d0296da382dd92ab964719d981fa32ee383e886 /fs/autofs/dev-ioctl.c | |
| parent | gpio: mpsse: Check for error code from devm_mutex_init() call (diff) | |
| parent | Linux 6.12-rc6 (diff) | |
| download | kernel-a7a86fe18b9a3c1e3f2c0b4687bf53cc2b9f9f88.tar.gz kernel-a7a86fe18b9a3c1e3f2c0b4687bf53cc2b9f9f88.zip | |
Merge tag 'v6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.12-rc6
Diffstat (limited to 'fs/autofs/dev-ioctl.c')
| -rw-r--r-- | fs/autofs/dev-ioctl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c index f011e026358e..6d57efbb8110 100644 --- a/fs/autofs/dev-ioctl.c +++ b/fs/autofs/dev-ioctl.c @@ -110,6 +110,7 @@ static inline void free_dev_ioctl(struct autofs_dev_ioctl *param) */ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) { + unsigned int inr = _IOC_NR(cmd); int err; err = check_dev_ioctl_version(cmd, param); @@ -133,7 +134,7 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) * check_name() return for AUTOFS_DEV_IOCTL_TIMEOUT_CMD. */ err = check_name(param->path); - if (cmd == AUTOFS_DEV_IOCTL_TIMEOUT_CMD) + if (inr == AUTOFS_DEV_IOCTL_TIMEOUT_CMD) err = err ? 0 : -EINVAL; if (err) { pr_warn("invalid path supplied for cmd(0x%08x)\n", @@ -141,8 +142,6 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) goto out; } } else { - unsigned int inr = _IOC_NR(cmd); - if (inr == AUTOFS_DEV_IOCTL_OPENMOUNT_CMD || inr == AUTOFS_DEV_IOCTL_REQUESTER_CMD || inr == AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD) { |