diff options
| author | Bryan Schumaker <bjschuma@netapp.com> | 2012-10-02 16:01:38 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 13:04:09 -0700 |
| commit | ddfc4e171292d63d7e3f8c95ff9c3ef9932870ce (patch) | |
| tree | 1464e97f079348fdff1f77eb8eb1dca9fc6cd88a /fs/nfs/idmap.c | |
| parent | fd4835708ffd3387a76df2d1d3021717b0b63761 (diff) | |
| download | linux-3.10-ddfc4e171292d63d7e3f8c95ff9c3ef9932870ce.tar.gz linux-3.10-ddfc4e171292d63d7e3f8c95ff9c3ef9932870ce.tar.bz2 linux-3.10-ddfc4e171292d63d7e3f8c95ff9c3ef9932870ce.zip | |
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>
Diffstat (limited to 'fs/nfs/idmap.c')
| -rw-r--r-- | fs/nfs/idmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 675b389cba5..9cc4a3fbf4b 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) |