From cff7ae9c166438637cba6879f15f3f45e48ad4c4 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 18 Jul 2007 11:28:43 -0400
Subject: [PATCH] --- yaml --- r: 61870 b: refs/heads/master c:
 0a87cf128f3d3bc6aa7b1040e73109c974ed875a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a5e8e0e8bbcf..c7e005da2a99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9d888fcd9665b863fa042212a3ee7b4c51399f6
+refs/heads/master: 0a87cf128f3d3bc6aa7b1040e73109c974ed875a
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index adffe1615c51..b34b7a711d5b 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1685,6 +1685,9 @@ static int nfs4_validate_mount_data(struct nfs4_mount_data **options,
 
 		dprintk("MNTPATH: %s\n", *mntpath);
 
+		if (args.client_address == NULL)
+			goto out_no_client_address;
+
 		*ip_addr = args.client_address;
 
 		break;
@@ -1705,6 +1708,10 @@ static int nfs4_validate_mount_data(struct nfs4_mount_data **options,
 out_no_address:
 	dfprintk(MOUNT, "NFS4: mount program didn't pass remote address\n");
 	return -EINVAL;
+
+out_no_client_address:
+	dfprintk(MOUNT, "NFS4: mount program didn't pass callback address\n");
+	return -EINVAL;
 }
 
 /*