]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
NFS: Set key construction data for the legacy upcall
authorBryan Schumaker <bjschuma@netapp.com>
Tue, 2 Oct 2012 20:01:38 +0000 (16:01 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 2 Oct 2012 20:04:09 +0000 (13:04 -0700)
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>
fs/nfs/idmap.c

index 675b389cba5b1307ad637ff6d8e93dbca78eb315..9cc4a3fbf4b0d4ab3106b7584ba756776005e6f8 100644 (file)
@@ -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)