From: Bryan Schumaker <bjschuma@xxxxxxxxxx> This prevents a null pointer dereference when nfs_idmap_complete_pipe_upcall_locked() calls complete_request_key(). Signed-off-by: Bryan Schumaker <bjschuma@xxxxxxxxxx> --- fs/nfs/idmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 675b389c..9cc4a3f 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) -- 1.7.12.2 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html