diff options
| author | Andrea Claudi <aclaudi@redhat.com> | 2022-05-13 11:52:30 +0200 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2022-05-17 12:57:45 -0700 |
| commit | 4429a6c9b484bc02dfab1e020a9b6f9f77370331 (patch) | |
| tree | eb75a4b780c9ae8d6f89addab8ad589ce667625b | |
| parent | 6b6979b9d443d5008e9db5dbf2849de619a8fa67 (diff) | |
| download | iproute2-4429a6c9b484bc02dfab1e020a9b6f9f77370331.tar.gz | |
tipc: fix keylen check
Key length check in str2key() is wrong for hex. Fix this using the
proper hex key length.
Fixes: 28ee49e5153b ("tipc: bail out if key is abnormally long")
Suggested-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | tipc/misc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tipc/misc.c b/tipc/misc.c index 909975d8b..6175bf07d 100644 --- a/tipc/misc.c +++ b/tipc/misc.c @@ -113,16 +113,15 @@ int str2key(char *str, struct tipc_aead_key *key) } } - if (len > TIPC_AEAD_KEYLEN_MAX) + key->keylen = ishex ? (len + 1) / 2 : len; + if (key->keylen > TIPC_AEAD_KEYLEN_MAX) return -1; /* Obtain key: */ if (!ishex) { - key->keylen = len; memcpy(key->key, str, len); } else { /* Convert hex string to key */ - key->keylen = (len + 1) / 2; for (i = 0; i < key->keylen; i++) { if (i == 0 && len % 2 != 0) { if (sscanf(str, "%1hhx", &key->key[0]) != 1) |