[PATCH] autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	NeilBrown <neilb@suse.com>
Newsgroups	linux.kernel
Subject	[PATCH] autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
Date	Wed, 07 Jun 2017 04:10:02 +0200
Message-ID	<tPyA2-eM-15@gated-at.bofh.it> (permalink)
MIME-Version	1.0
Content-Type	multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature"
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	58
Organization	linux.* mail to news gateway
X-Original-Cc	LKML <linux-kernel@vger.kernel.org>, autofs mailing list <autofs@vger.kernel.org>
X-Original-Date	Wed, 07 Jun 2017 12:08:38 +1000
X-Original-Message-ID	<871sqwczx5.fsf@notabene.neil.brown.name>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1659339

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

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().

Signed-off-by: NeilBrown <neilb@suse.com>
---
 fs/autofs4/dev-ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 734cbf8d9676..dd9f1bebb5a3 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -344,7 +344,7 @@ static int autofs_dev_ioctl_fail(struct file *fp,
 	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);
 }
 
-- 
2.12.2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL NeilBrown <neilb@suse.com> - 2017-06-07 04:10 +0200

csiph-web