autofs - fix slab out of bounds read in getname_kernel()

Commit Message

Ian Kent July 3, 2018, 6:45 a.m. UTC

Initial patch contributed by Tomas Bortoli.

The autofs subsystem does not check that the "path" parameter is
present for all cases where it is required when it is passed in
via the "param" struct.

In particular it isn't checked for the AUTOFS_DEV_IOCTL_OPENMOUNT_CMD
ioctl command.

To solve it, modify validate_dev_ioctl() function to check that a
path has been provided for ioctl commands that require it.

Signed-off-by: Tomas Bortoli <[e-mail]>
Signed-off-by: Ian Kent <[e-mail]>
Reported-by: [e-mail]
---
 fs/autofs/dev-ioctl.c |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Comments

Andrew Morton July 5, 2018, 11:58 p.m. UTC | #1

On Tue, 03 Jul 2018 14:45:15 +0800 Ian Kent <[e-mail]> wrote:

> Initial patch contributed by Tomas Bortoli.
> 
> The autofs subsystem does not check that the "path" parameter is
> present for all cases where it is required when it is passed in
> via the "param" struct.
> 
> In particular it isn't checked for the AUTOFS_DEV_IOCTL_OPENMOUNT_CMD
> ioctl command.
> 
> To solve it, modify validate_dev_ioctl() function to check that a
> path has been provided for ioctl commands that require it.
> 
> Signed-off-by: Tomas Bortoli <[e-mail]>
> Signed-off-by: Ian Kent <[e-mail]>
> Reported-by: [e-mail]

So who is the primary author of this?  I'm assuming "Tomas" from the
signoff order?

The way of signifying this is to put the other author's From: line right
at the top of changelog.

I assume this is a root-only bug, so we don't need to backport the fix?

Ian Kent July 6, 2018, 1:08 a.m. UTC | #2

On Thu, 2018-07-05 at 16:58 -0700, Andrew Morton wrote:
> On Tue, 03 Jul 2018 14:45:15 +0800 Ian Kent <[e-mail]> wrote:
> 
> > Initial patch contributed by Tomas Bortoli.
> > 
> > The autofs subsystem does not check that the "path" parameter is
> > present for all cases where it is required when it is passed in
> > via the "param" struct.
> > 
> > In particular it isn't checked for the AUTOFS_DEV_IOCTL_OPENMOUNT_CMD
> > ioctl command.
> > 
> > To solve it, modify validate_dev_ioctl() function to check that a
> > path has been provided for ioctl commands that require it.
> > 
> > Signed-off-by: Tomas Bortoli <[e-mail]>
> > Signed-off-by: Ian Kent <[e-mail]>
> > Reported-by: [e-mail]
> 
> So who is the primary author of this?  I'm assuming "Tomas" from the
> signoff order?

Yes, Tomas was the originator but I did change it somewhat so added
my Signed-off-by as well.

> 
> The way of signifying this is to put the other author's From: line right
> at the top of changelog.

Oh, ok, will do in future, although my changes were fairly significant.

IMHO it was a joint effort more or less equal by both of us.
Nevertheless I would have been happy to list Tomas as the From author.

> 
> I assume this is a root-only bug, so we don't need to backport the fix?

It is, so yes that's right, unless Tomas has other recommendations.

Ian

Patch

diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c
index ea4ca1445ab7..86eafda4a652 100644
--- a/fs/autofs/dev-ioctl.c
+++ b/fs/autofs/dev-ioctl.c
@@ -135,6 +135,15 @@  static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)
 				cmd);
 			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) {
+			err = -EINVAL;
+			goto out;
+		}
 	}
 
 	err = 0;
@@ -271,7 +280,8 @@  static int autofs_dev_ioctl_openmount(struct file *fp,
 	dev_t devid;
 	int err, fd;
 
-	/* param->path has already been checked */
+	/* param->path has been checked in validate_dev_ioctl() */
+
 	if (!param->openmount.devid)
 		return -EINVAL;
 
@@ -433,10 +443,7 @@  static int autofs_dev_ioctl_requester(struct file *fp,
 	dev_t devid;
 	int err = -ENOENT;
 
-	if (param->size <= AUTOFS_DEV_IOCTL_SIZE) {
-		err = -EINVAL;
-		goto out;
-	}
+	/* param->path has been checked in validate_dev_ioctl() */
 
 	devid = sbi->sb->s_dev;
 
@@ -521,10 +528,7 @@  static int autofs_dev_ioctl_ismountpoint(struct file *fp,
 	unsigned int devid, magic;
 	int err = -ENOENT;
 
-	if (param->size <= AUTOFS_DEV_IOCTL_SIZE) {
-		err = -EINVAL;
-		goto out;
-	}
+	/* param->path has been checked in validate_dev_ioctl() */
 
 	name = param->path;
 	type = param->ismountpoint.in.type;