ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

l2: avoid overflow read of mac address

Browse Source 
Type: improvement
Change-Id: I99d2c69ede39b3ba5604e1811ce12209c47f5caf
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2022-03-25 16:20:16 +01:00
committed by Beno�t Ganne
parent 3d390ba8de
commit 38235c38e1
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/vnet/l2/l2_fib.h
View File

@@ -240,29 +240,9 @@ l2fib_compute_hash_bucket (l2fib_entry_key_t * key)
always_inline u64
l2fib_make_key (const u8 * mac_address, u16 bd_index)
{
u64 temp;
/*
* The mac address in memory is A:B:C:D:E:F
* The bd id in register is H:L
*/
#if CLIB_ARCH_IS_LITTLE_ENDIAN
/*
* Create the in-register key as F:E:D:C:B:A:H:L
* In memory the key is L:H:A:B:C:D:E:F
*/
temp = CLIB_MEM_OVERFLOW_LOAD ((u64 *) mac_address) << 16;
temp = (temp & ~0xffff) | (u64) (bd_index);
#else
/*
* Create the in-register key as H:L:A:B:C:D:E:F
* In memory the key is H:L:A:B:C:D:E:F
*/
temp = CLIB_MEM_OVERFLOW_LOAD ((u64 *) mac_address) >> 16;
temp = temp | (((u64) bd_index) << 48);
#endif
return temp;
l2fib_entry_key_t key = { .fields.bd_index = bd_index };
clib_memcpy_fast (&key.fields.mac, mac_address, sizeof (key.fields.mac));
return key.raw;
}