harden-autofs-ioctl-table.patch removed from -mm tree
The patch titled
Subject: autofs: harden ioctl table
has been removed from the -mm tree. Its filename was
harden-autofs-ioctl-table.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Matthew Wilcox <[email protected]>
Subject: autofs: harden ioctl table
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) <[email protected]>
Acked-by Ian Kent <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/autofs/dev-ioctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/autofs/dev-ioctl.c renamed from fs/autofs/dev-ioctl.c~harden-autofs-ioctl-table +6 -2
@@ -8,6 +8,7 @@#include <linux/compat.h> #include <linux/syscalls.h> #include <linux/magic.h> +#include <linux/nospec.h> #include "autofs_i.h"
@@ -563,7 +564,7 @@ out: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_protover, autofs_dev_ioctl_protosubver,
@@ -581,7 +582,10 @@ static ioctl_fn lookup_dev_ioctl(unsigne };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 */
_
Patches currently in -mm which might be from [email protected] are
mm-update-the-documentation-for-vfree.patch