From 66646cbc5ba12d23f74b05ed480d6b733dd9d65b Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Fri, 25 Mar 2011 01:51:37 +0800
Subject: [PATCH] --- yaml --- r: 242339 b: refs/heads/master c:
 3dc8fe4dca9cd3e4aa828ed36451e2bcfd2350da h: refs/heads/master i:   242337:
 f20ae23af2e8790abb4661fca0b94ec480e6c433   242335:
 8830b6dd03605203d70b2e59373f41975ce97895 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/autofs4/dev-ioctl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index df901ac90152..baa16bd7e450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7854723d0f3626f260c880d8db8e5136f29db19
+refs/heads/master: 3dc8fe4dca9cd3e4aa828ed36451e2bcfd2350da
diff --git a/trunk/fs/autofs4/dev-ioctl.c b/trunk/fs/autofs4/dev-ioctl.c
index 1442da4860e5..509fe1eb66ae 100644
--- a/trunk/fs/autofs4/dev-ioctl.c
+++ b/trunk/fs/autofs4/dev-ioctl.c
@@ -372,6 +372,10 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
 		return -EBUSY;
 	} else {
 		struct file *pipe = fget(pipefd);
+		if (!pipe) {
+			err = -EBADF;
+			goto out;
+		}
 		if (!pipe->f_op || !pipe->f_op->write) {
 			err = -EPIPE;
 			fput(pipe);