Skip to content
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

Jump to bottom

net: l2: ethernet: check dev->api and get_capabilities for being NULL #77841

Merged
merged 3 commits into from
Sep 4, 2024
Merged

net: l2: ethernet: check dev->api and get_capabilities for being NULL #77841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8e7562
net: l2: ethernet: check if the dev->api->get_capabilities method not…
panekmaciej Aug 31, 2024
648896a
net: l2: ethernet: check if the dev->api->send method not NULL
panekmaciej Aug 31, 2024
49bb666
net: l2: ethernet: check if the dev->api not NULL
panekmaciej Aug 31, 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
8 changes: 4 additions & 4 deletions include/zephyr/net/ethernet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,14 +933,14 @@ void net_eth_ipv6_mcast_to_mac_addr(const struct in6_addr *ipv6_addr,
static inline
enum ethernet_hw_caps net_eth_get_hw_capabilities(struct net_if *iface)
{
const struct ethernet_api *eth =
(struct ethernet_api *)net_if_get_device(iface)->api;
const struct device *dev = net_if_get_device(iface);
const struct ethernet_api *api = (struct ethernet_api *)dev->api;

if (!eth->get_capabilities) {
if (!api || !api->get_capabilities) {
return (enum ethernet_hw_caps)0;
}

return eth->get_capabilities(net_if_get_device(iface));
return api->get_capabilities(dev);
}

/**
Expand Down
24 changes: 14 additions & 10 deletions subsys/net/l2/ethernet/ethernet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,7 @@ static void ethernet_update_rx_stats(struct net_if *iface,

static inline bool eth_is_vlan_tag_stripped(struct net_if *iface)
{
const struct device *dev = net_if_get_device(iface);
const struct ethernet_api *api = dev->api;

return (api->get_capabilities(dev) & ETHERNET_HW_VLAN_TAG_STRIP);
return (net_eth_get_hw_capabilities(iface) & ETHERNET_HW_VLAN_TAG_STRIP);
}

/* Drop packet if it has broadcast destination MAC address but the IP
Expand Down Expand Up @@ -199,18 +196,20 @@ static void ethernet_mcast_monitor_cb(struct net_if *iface, const struct net_add
.type = ETHERNET_FILTER_TYPE_DST_MAC_ADDRESS,
},
};
const struct device *dev;
const struct ethernet_api *api;

const struct device *dev = net_if_get_device(iface);
const struct ethernet_api *api = dev->api;

/* Make sure we're an ethernet device */
if (net_if_l2(iface) != &NET_L2_GET_NAME(ETHERNET)) {
return;
}

dev = net_if_get_device(iface);
api = dev->api;
if (!(net_eth_get_hw_capabilities(iface) & ETHERNET_HW_FILTERING)) {
return;
}

if (!(api->get_capabilities(dev) & ETHERNET_HW_FILTERING) || api->set_config == NULL) {
if (!api || !api->set_config) {
return;
}

Expand Down Expand Up @@ -621,6 +620,11 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
goto error;
}

if (!api->send) {
ret = -ENOTSUP;
goto error;
}

if (IS_ENABLED(CONFIG_NET_ETHERNET_BRIDGE) &&
net_pkt_is_l2_bridged(pkt)) {
net_pkt_cursor_init(pkt);
Expand Down Expand Up @@ -868,7 +872,7 @@ const struct device *net_eth_get_ptp_clock(struct net_if *iface)
return NULL;
}

if (!(api->get_capabilities(dev) & ETHERNET_PTP)) {
if (!(net_eth_get_hw_capabilities(iface) & ETHERNET_PTP)) {
return NULL;
}

Expand Down
4 changes: 2 additions & 2 deletions subsys/net/l2/ethernet/ethernet_mgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ static inline bool is_hw_caps_supported(const struct device *dev,
{
const struct ethernet_api *api = dev->api;

if (!api) {
if (!api || !api->get_capabilities) {
return false;
}

return !!(api->get_capabilities(dev) & caps);
return ((api->get_capabilities(dev) & caps) != 0);
}

static int ethernet_set_config(uint32_t mgmt_request,
Expand Down
Loading