abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-07 15:04:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

bridgeif: gracefully handle out-of-memory in bridgeif_fdb_init

Browse Source
This commit is contained in:
goldsimon 2017-04-04 21:54:30 +02:00
parent e65a0950b2
commit 8ed2bd4771
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/netif/bridgeif.c
View File

@ -220,8 +220,11 @@ bridgeif_fdb_init(u16_t max_fdb_entries)
{ {
bridgeif_dfdb_t *fdb; bridgeif_dfdb_t *fdb;
mem_size_t alloc_len = sizeof(bridgeif_dfdb_t) + (max_fdb_entries*sizeof(bridgeif_dfdb_entry_t)); mem_size_t alloc_len = sizeof(bridgeif_dfdb_t) + (max_fdb_entries*sizeof(bridgeif_dfdb_entry_t));
LWIP_DEBUGF(BRIDGEIF_DEBUG, ("bridgeif_init: allocating %d bytes for private data\n", (int)alloc_len)); LWIP_DEBUGF(BRIDGEIF_DEBUG, ("bridgeif_fdb_init: allocating %d bytes for private FDB data\n", (int)alloc_len));
fdb = (bridgeif_dfdb_t*)mem_malloc(alloc_len); fdb = (bridgeif_dfdb_t*)mem_malloc(alloc_len);
if (fdb == NULL) {
return NULL;
}
memset(fdb, 0, alloc_len); memset(fdb, 0, alloc_len);
fdb->max_fdb_entries = max_fdb_entries; fdb->max_fdb_entries = max_fdb_entries;
fdb->fdb = (bridgeif_dfdb_entry_t *)(fdb + 1); fdb->fdb = (bridgeif_dfdb_entry_t *)(fdb + 1);
@ -596,6 +599,11 @@ bridgeif_init(struct netif *netif)
br->max_fdbd_entries = init_data->max_fdb_dynamic_entries; br->max_fdbd_entries = init_data->max_fdb_dynamic_entries;
br->fdbd = bridgeif_fdb_init(init_data->max_fdb_static_entries); br->fdbd = bridgeif_fdb_init(init_data->max_fdb_static_entries);
if (br->fdbd == NULL) {
LWIP_DEBUGF(NETIF_DEBUG, ("bridgeif_init: out of memory in fdb_init\n"));
mem_free(br);
return ERR_MEM;
}
#if LWIP_NETIF_HOSTNAME #if LWIP_NETIF_HOSTNAME
/* Initialize interface hostname */ /* Initialize interface hostname */