Skip to content

[Backport v4.0-branch] net: ethernet: bridge: Avoid null pointer access #82239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2024
Merged

[Backport v4.0-branch] net: ethernet: bridge: Avoid null pointer access #82239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04292a7
net: ethernet: bridge: Avoid null pointer access
jukkar Nov 26, 2024
c4f2e2c
net: ethernet: bridge: Drop the cloned packet in error
jukkar Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions subsys/net/l2/ethernet/bridge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ static enum net_verdict bridge_iface_process(struct net_if *iface,
/* Drop all link-local packets for now. */
if (is_link_local_addr((struct net_eth_addr *)net_pkt_lladdr_dst(pkt))) {
NET_DBG("DROP: lladdr");
return NET_DROP;
goto out;
}

lock_bridge(ctx);
Expand All @@ -372,6 +372,11 @@ static enum net_verdict bridge_iface_process(struct net_if *iface,
*/
if (count > 2) {
send_pkt = net_pkt_clone(pkt, K_NO_WAIT);
if (send_pkt == NULL) {
NET_DBG("DROP: clone failed");
break;
}

net_pkt_ref(send_pkt);
} else {
send_pkt = net_pkt_ref(pkt);
Expand All @@ -392,11 +397,11 @@ static enum net_verdict bridge_iface_process(struct net_if *iface,

unlock_bridge(ctx);

out:
/* The packet was cloned by the caller so remove it here. */
net_pkt_unref(pkt);

return NET_OK;

}

int bridge_iface_send(struct net_if *iface, struct net_pkt *pkt)
Expand Down
Loading