NFS: reject request for id_legacy key without auxdata
authorEric Biggers <ebiggers@google.com>
Fri, 19 Jan 2018 23:15:34 +0000 (15:15 -0800)
committerTrond Myklebust <trondmy@gmail.com>
Mon, 22 Jan 2018 15:05:11 +0000 (10:05 -0500)
commit49686cbbb3ebafe42e63868222f269d8053ead00
tree4b3cbd32a2650de894100c554a75d4010edbfe20
parentcbebc6ef4fc830f4040d4140bf53484812d5d5d9
NFS: reject request for id_legacy key without auxdata

nfs_idmap_legacy_upcall() is supposed to be called with 'aux' pointing
to a 'struct idmap', via the call to request_key_with_auxdata() in
nfs_idmap_request_key().

However it can also be reached via the request_key() system call in
which case 'aux' will be NULL, causing a NULL pointer dereference in
nfs_idmap_prepare_pipe_upcall(), assuming that the key description is
valid enough to get that far.

Fix this by making nfs_idmap_legacy_upcall() negate the key if no
auxdata is provided.

As usual, this bug was found by syzkaller.  A simple reproducer using
the command-line keyctl program is:

    keyctl request2 id_legacy uid:0 '' @s

Fixes: 57e62324e469 ("NFS: Store the legacy idmapper result in the keyring")
Reported-by: syzbot+5dfdbcf7b3eb5912abbb@syzkaller.appspotmail.com
Cc: <stable@vger.kernel.org> # v3.4+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Trond Myklebust <trondmy@gmail.com>
fs/nfs/nfs4idmap.c