diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-09-11 17:45:36 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-09-11 17:45:36 +0530 |
| commit | 4c80e9323967125ab8aa7c271ccc7624abc08832 (patch) | |
| tree | c9881b5814c184aa0c1cb58c6383beab9173e388 /security/selinux/hooks.c | |
| parent | ef759e4a28c88965972c815af6023f41bd733316 (diff) | |
| parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
Merge tag 'v5.9-rc4' into next
Linux 5.9-rc4
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ca901025802a..a340986aa92e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3606,26 +3606,20 @@ static int selinux_file_ioctl(struct file *file, unsigned int cmd, switch (cmd) { case FIONREAD: - /* fall through */ case FIBMAP: - /* fall through */ case FIGETBSZ: - /* fall through */ case FS_IOC_GETFLAGS: - /* fall through */ case FS_IOC_GETVERSION: error = file_has_perm(cred, file, FILE__GETATTR); break; case FS_IOC_SETFLAGS: - /* fall through */ case FS_IOC_SETVERSION: error = file_has_perm(cred, file, FILE__SETATTR); break; /* sys_ioctl() checks */ case FIONBIO: - /* fall through */ case FIOASYNC: error = file_has_perm(cred, file, 0); break; @@ -3783,7 +3777,7 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd, err = file_has_perm(cred, file, FILE__WRITE); break; } - /* fall through */ + fallthrough; case F_SETOWN: case F_SETSIG: case F_GETFL: |