From: Bryan Schumaker <bjschuma@netapp.com>
Date: Tue, 2 Oct 2012 20:01:38 +0000 (-0400)
Subject: NFS: Set key construction data for the legacy upcall
X-Git-Tag: next-20121003~79^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ddfc4e171292d63d7e3f8c95ff9c3ef9932870ce;p=karo-tx-linux.git

NFS: Set key construction data for the legacy upcall

This prevents a null pointer dereference when
nfs_idmap_complete_pipe_upcall_locked() calls complete_request_key().

Fixes a regression caused by commit 0cac12023 (NFSv4: Ensure that
idmap_pipe_downcall sanity-checks the downcall data).

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 675b389cba5b..9cc4a3fbf4b0 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -707,6 +707,7 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons,
 	msg = &data->pipe_msg;
 	im = &data->idmap_msg;
 	data->idmap = idmap;
+	data->key_cons = cons;
 
 	ret = nfs_idmap_prepare_message(key->description, idmap, im, msg);
 	if (ret < 0)