network: make check-pointer-deref clean
Add the needed assert changes to make the code clean for the new check-pointer-deref script.
This commit is contained in:
@@ -2980,7 +2980,6 @@ if spatch.found()
|
||||
'src/basic/',
|
||||
'src/core/',
|
||||
'src/libsystemd/',
|
||||
'src/network/',
|
||||
'src/shared/',
|
||||
# libc/ has no assert() or systemd-headers so leave it
|
||||
'src/libc/',
|
||||
|
||||
@@ -119,6 +119,7 @@ static int address_new(
|
||||
assert(network);
|
||||
assert(IN_SET(family, AF_INET, AF_INET6));
|
||||
assert(addr);
|
||||
POINTER_MAY_BE_NULL(peer);
|
||||
|
||||
address = new(Address, 1);
|
||||
if (!address)
|
||||
|
||||
@@ -125,6 +125,7 @@ static int macsec_receive_channel_new(MACsec *s, uint64_t sci, ReceiveChannel **
|
||||
ReceiveChannel *c;
|
||||
|
||||
assert(s);
|
||||
assert(ret);
|
||||
|
||||
c = new(ReceiveChannel, 1);
|
||||
if (!c)
|
||||
|
||||
@@ -277,6 +277,7 @@ static int netdev_attach_name_full(NetDev *netdev, const char *name, Hashmap **n
|
||||
|
||||
assert(netdev);
|
||||
assert(name);
|
||||
assert(netdevs);
|
||||
|
||||
r = hashmap_ensure_put(netdevs, &string_hash_ops, name, netdev);
|
||||
if (r == -ENOMEM)
|
||||
|
||||
@@ -20,6 +20,9 @@ static int ifindex_str_compare_func(char * const *a, char * const *b) {
|
||||
size_t al, bl;
|
||||
int r;
|
||||
|
||||
assert(a);
|
||||
assert(b);
|
||||
|
||||
al = strlen_ptr(*a);
|
||||
bl = strlen_ptr(*b);
|
||||
|
||||
|
||||
@@ -276,6 +276,7 @@ int link_get_captive_portal(Link *link, const char **ret) {
|
||||
int r;
|
||||
|
||||
assert(link);
|
||||
assert(ret);
|
||||
|
||||
if (!link->network) {
|
||||
*ret = NULL;
|
||||
|
||||
@@ -557,6 +557,7 @@ static int dhcp_pd_get_preferred_subnet_prefix(
|
||||
assert(link->manager);
|
||||
assert(link->network);
|
||||
assert(pd_prefix);
|
||||
assert(ret);
|
||||
|
||||
if (link->network->dhcp_pd_subnet_id >= 0) {
|
||||
/* If the link has a preference for a particular subnet id try to allocate that */
|
||||
|
||||
@@ -326,6 +326,7 @@ void manager_toggle_dhcp4_server_state(Manager *manager, bool start) {
|
||||
|
||||
static int dhcp_server_find_uplink(Link *link, Link **ret) {
|
||||
assert(link);
|
||||
assert(ret);
|
||||
|
||||
if (link->network->dhcp_server_uplink_name)
|
||||
return link_get_by_name(link->manager, link->network->dhcp_server_uplink_name, ret);
|
||||
|
||||
@@ -862,6 +862,7 @@ static int link_put_carrier(Link *link, Link *carrier, Hashmap **h) {
|
||||
|
||||
assert(link);
|
||||
assert(carrier);
|
||||
assert(h);
|
||||
|
||||
if (link == carrier)
|
||||
return 0;
|
||||
|
||||
@@ -423,6 +423,7 @@ static int radv_find_uplink(Link *link, Link **ret) {
|
||||
int r;
|
||||
|
||||
assert(link);
|
||||
assert(ret);
|
||||
|
||||
if (link->network->router_uplink_name)
|
||||
return link_get_by_name(link->manager, link->network->router_uplink_name, ret);
|
||||
|
||||
@@ -99,6 +99,8 @@ DEFINE_SECTION_CLEANUP_FUNCTIONS(RoutingPolicyRule, routing_policy_rule_unref);
|
||||
static int routing_policy_rule_new(RoutingPolicyRule **ret) {
|
||||
RoutingPolicyRule *rule;
|
||||
|
||||
assert(ret);
|
||||
|
||||
rule = new(RoutingPolicyRule, 1);
|
||||
if (!rule)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -235,6 +235,7 @@ int link_get_modem(Link *link, Modem **ret) {
|
||||
assert(link);
|
||||
assert(link->manager);
|
||||
assert(link->ifname);
|
||||
assert(ret);
|
||||
|
||||
HASHMAP_FOREACH(modem, link->manager->modems_by_path)
|
||||
if (modem->port_name && streq(modem->port_name, link->ifname)) {
|
||||
|
||||
Reference in New Issue
Block a user