diff options
author | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
commit | aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478 (patch) | |
tree | ad35f7c066ef1e52febbbfc0fc62fe9623cc4e00 /crypto/authenc.c | |
parent | 7ff17fe228094bad025c79c39e9e23af4364644c (diff) | |
parent | bc2a1ca9b6b0c50decebcbb4c6b4160cf81eed93 (diff) | |
download | linux-crypto-aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478.tar.gz linux-crypto-aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478.zip |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'crypto/authenc.c')
-rw-r--r-- | crypto/authenc.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c index 37f54d1b..4be293a4 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c @@ -58,14 +58,22 @@ int crypto_authenc_extractkeys(struct crypto_authenc_keys *keys, const u8 *key, return -EINVAL; if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM) return -EINVAL; - if (RTA_PAYLOAD(rta) < sizeof(*param)) + + /* + * RTA_OK() didn't align the rtattr's payload when validating that it + * fits in the buffer. Yet, the keys should start on the next 4-byte + * aligned boundary. To avoid confusion, require that the rtattr + * payload be exactly the param struct, which has a 4-byte aligned size. + */ + if (RTA_PAYLOAD(rta) != sizeof(*param)) return -EINVAL; + BUILD_BUG_ON(sizeof(*param) % RTA_ALIGNTO); param = RTA_DATA(rta); keys->enckeylen = be32_to_cpu(param->enckeylen); - key += RTA_ALIGN(rta->rta_len); - keylen -= RTA_ALIGN(rta->rta_len); + key += rta->rta_len; + keylen -= rta->rta_len; if (keylen < keys->enckeylen) return -EINVAL; |