Skip to content

Commit

Permalink
KEYS: fix length validation in keyctl_pkey_params_get_2()
Browse files Browse the repository at this point in the history
In many cases, keyctl_pkey_params_get_2() is validating the user buffer
lengths against the wrong algorithm properties.  Fix it to check against
the correct properties.

Probably this wasn't noticed before because for all asymmetric keys of
the "public_key" subtype, max_data_size == max_sig_size == max_enc_size
== max_dec_size.  However, this isn't necessarily true for the
"asym_tpm" subtype (it should be, but it's not strictly validated).  Of
course, future key types could have different values as well.

Fixes: 00d60fd ("KEYS: Provide keyctls to drive the new key type ops for asymmetric keys [ver #2]")
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
  • Loading branch information
ebiggers authored and jarkkojs committed Mar 8, 2022
1 parent 8335adb commit c51abd9
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions security/keys/keyctl_pkey.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,23 +135,31 @@ static int keyctl_pkey_params_get_2(const struct keyctl_pkey_params __user *_par

switch (op) {
case KEYCTL_PKEY_ENCRYPT:
if (uparams.in_len > info.max_dec_size ||
uparams.out_len > info.max_enc_size)
return -EINVAL;
break;
case KEYCTL_PKEY_DECRYPT:
if (uparams.in_len > info.max_enc_size ||
uparams.out_len > info.max_dec_size)
return -EINVAL;
break;
case KEYCTL_PKEY_SIGN:
if (uparams.in_len > info.max_data_size ||
uparams.out_len > info.max_sig_size)
return -EINVAL;
break;
case KEYCTL_PKEY_VERIFY:
if (uparams.in_len > info.max_sig_size ||
uparams.out_len > info.max_data_size)
if (uparams.in_len > info.max_data_size ||
uparams.in2_len > info.max_sig_size)
return -EINVAL;
break;
default:
BUG();
}

params->in_len = uparams.in_len;
params->out_len = uparams.out_len;
params->out_len = uparams.out_len; /* Note: same as in2_len */
return 0;
}

Expand Down

0 comments on commit c51abd9

Please sign in to comment.