AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 00:00:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofs: harden ioctl table

Browse Source 
The table of ioctl functions should be marked const in order to put them
in read-only memory, and we should use array_index_nospec() to avoid
speculation disclosing the contents of kernel memory to userspace.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Ian Kent <raven@themaw.net>
Link: https://lkml.kernel.org/r/20200818122203.GO17456@casper.infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox 2020-10-15 20:13:08 -07:00 committed by Linus Torvalds
parent 50b7d85680
commit 589f6b5268
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/autofs/dev-ioctl.c
View File

@ -8,6 +8,7 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <linux/nospec.h>
#include "autofs_i.h" #include "autofs_i.h"
@ -563,7 +564,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
static ioctl_fn lookup_dev_ioctl(unsigned int cmd) static ioctl_fn lookup_dev_ioctl(unsigned int cmd)
{ {
static ioctl_fn _ioctls[] = { static const ioctl_fn _ioctls[] = {
autofs_dev_ioctl_version, autofs_dev_ioctl_version,
autofs_dev_ioctl_protover, autofs_dev_ioctl_protover,
autofs_dev_ioctl_protosubver, autofs_dev_ioctl_protosubver,
@ -581,7 +582,10 @@ static ioctl_fn lookup_dev_ioctl(unsigned int cmd)
}; };
unsigned int idx = cmd_idx(cmd); unsigned int idx = cmd_idx(cmd);
return (idx >= ARRAY_SIZE(_ioctls)) ? NULL : _ioctls[idx]; if (idx >= ARRAY_SIZE(_ioctls))
return NULL;
idx = array_index_nospec(idx, ARRAY_SIZE(_ioctls));
return _ioctls[idx];
} }
/* ioctl dispatcher */ /* ioctl dispatcher */