* Patch "autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL" has been added to the 4.11-stable tree
@ 2017-06-26 6:15 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2017-06-26 6:15 UTC (permalink / raw)
To: neilb, akpm, gregkh, raven, torvalds; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
autofs-sanity-check-status-reported-with-autofs_dev_ioctl_fail.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 9fa4eb8e490a28de40964b1b0e583d8db4c7e57c Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.com>
Date: Fri, 23 Jun 2017 15:08:43 -0700
Subject: autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
From: NeilBrown <neilb@suse.com>
commit 9fa4eb8e490a28de40964b1b0e583d8db4c7e57c 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>
---
fs/autofs4/dev-ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -344,7 +344,7 @@ static int autofs_dev_ioctl_fail(struct
int status;
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);
}
Patches currently in stable-queue which might be from neilb@suse.com are
queue-4.11/autofs-sanity-check-status-reported-with-autofs_dev_ioctl_fail.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-06-26 6:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-26 6:15 Patch "autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL" has been added to the 4.11-stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).