projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wireless: fix use-after-free bug
[project/netifd.git]
/
bridge.c
diff --git
a/bridge.c
b/bridge.c
index
01c9a2c
..
4ef0d7e
100644
(file)
--- a/
bridge.c
+++ b/
bridge.c
@@
-178,7
+178,7
@@
bridge_remove_member(struct bridge_member *bm)
if (!bm->present)
return;
if (!bm->present)
return;
- if (bm == bst->primary_port)
;
+ if (bm == bst->primary_port)
bridge_reset_primary(bst);
if (bst->dev.active)
bridge_reset_primary(bst);
if (bst->dev.active)
@@
-318,6
+318,9
@@
bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
struct bridge_member *bm;
bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1);
struct bridge_member *bm;
bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1);
+ if (!bm)
+ return NULL;
+
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
bm->dev.hotplug = hotplug;
bm->bst = bst;
bm->dev.cb = bridge_member_cb;
bm->dev.hotplug = hotplug;