autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
commit 9fa4eb8e49
upstream.
If a positive status is passed with the AUTOFS_DEV_IOCTL_FAIL ioctl,
autofs4_d_automount() will return
ERR_PTR(status)
with that status to follow_automount(), which will then dereference an
invalid pointer.
So treat a positive status the same as zero, and map to ENOENT.
See comment in systemd src/core/automount.c::automount_send_ready().
Link: http://lkml.kernel.org/r/871sqwczx5.fsf@notabene.neil.brown.name
Signed-off-by: NeilBrown <neilb@suse.com>
Cc: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4b660fcbc6
commit
bc6eecff3d
|
@ -345,7 +345,7 @@ static int autofs_dev_ioctl_fail(struct file *fp,
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
token = (autofs_wqt_t) param->fail.token;
|
token = (autofs_wqt_t) param->fail.token;
|
||||||
status = param->fail.status ? param->fail.status : -ENOENT;
|
status = param->fail.status < 0 ? param->fail.status : -ENOENT;
|
||||||
return autofs4_wait_release(sbi, token, status);
|
return autofs4_wait_release(sbi, token, status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue