xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: mscc: fix macsec key length

Browse Source 
[ Upstream commit c309217f91f2d2097c2a0a832d9bff50b88c81dc ]

The key length used to store the macsec key was set to MACSEC_KEYID_LEN
(16), which is an issue as:
- This was never meant to be the key length.
- The key length can be > 16.

Fix this by using MACSEC_MAX_KEY_LEN instead (the max length accepted in
uAPI).

Fixes: 28c5107aa9 ("net: phy: mscc: macsec support")
Reported-by: Lior Nahmanson <liorna@nvidia.com>
Signed-off-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Antoine Tenart
2021-06-24 11:38:29 +02:00
committed by Greg Kroah-Hartman
parent 711a28d24d
commit 1c95d4d432
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/phy/mscc/mscc_macsec.c
View File

@@ -501,7 +501,7 @@ static u32 vsc8584_macsec_flow_context_id(struct macsec_flow *flow)
} }
/* Derive the AES key to get a key for the hash autentication */ /* Derive the AES key to get a key for the hash autentication */
static int vsc8584_macsec_derive_key(const u8 key[MACSEC_KEYID_LEN], static int vsc8584_macsec_derive_key(const u8 key[MACSEC_MAX_KEY_LEN],
u16 key_len, u8 hkey[16]) u16 key_len, u8 hkey[16])
{ {
const u8 input[AES_BLOCK_SIZE] = {0}; const u8 input[AES_BLOCK_SIZE] = {0};

2
drivers/net/phy/mscc/mscc_macsec.h
View File

@@ -81,7 +81,7 @@ struct macsec_flow {
/* Highest takes precedence [0..15] */ /* Highest takes precedence [0..15] */
u8 priority; u8 priority;
u8 key[MACSEC_KEYID_LEN]; u8 key[MACSEC_MAX_KEY_LEN];
union { union {
struct macsec_rx_sa *rx_sa; struct macsec_rx_sa *rx_sa;