Skip to content

Commit

Permalink
treewide: Add ovs_assert to check for null pointers.
Browse files Browse the repository at this point in the history
This patch adds an assortment of `ovs_assert` statements to check for
null pointers. We use assertions since it should be impossible for any
of these pointers to be NULL.

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: James Raphael Tiovalen <jamestiotio@gmail.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
  • Loading branch information
jamestiotio authored and igsilya committed Sep 1, 2023
1 parent 40546cd commit bc79a7b
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 3 deletions.
1 change: 1 addition & 0 deletions lib/dp-packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ dp_packet_new_with_headroom(size_t size, size_t headroom)
struct dp_packet *
dp_packet_clone(const struct dp_packet *buffer)
{
ovs_assert(buffer);
return dp_packet_clone_with_headroom(buffer, 0);
}

Expand Down
4 changes: 4 additions & 0 deletions lib/odp-execute.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ odp_set_ipv4(struct dp_packet *packet, const struct ovs_key_ipv4 *key,
uint8_t new_tos;
uint8_t new_ttl;

ovs_assert(nh);

if (mask->ipv4_src) {
ip_src_nh = get_16aligned_be32(&nh->ip_src);
new_ip_src = key->ipv4_src | (ip_src_nh & ~mask->ipv4_src);
Expand Down Expand Up @@ -287,6 +289,8 @@ set_arp(struct dp_packet *packet, const struct ovs_key_arp *key,
{
struct arp_eth_header *arp = dp_packet_l3(packet);

ovs_assert(arp);

if (!mask) {
arp->ar_op = key->arp_op;
arp->ar_sha = key->arp_sha;
Expand Down
4 changes: 2 additions & 2 deletions lib/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ rtnetlink_parse(struct ofpbuf *buf, struct rtnetlink_change *change)
if (parsed) {
const struct ifinfomsg *ifinfo;

ifinfo = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *ifinfo);
ifinfo = ofpbuf_at_assert(buf, NLMSG_HDRLEN, sizeof *ifinfo);

/* Wireless events can be spammy and cause a
* lot of unnecessary churn and CPU load in
Expand Down Expand Up @@ -175,7 +175,7 @@ rtnetlink_parse(struct ofpbuf *buf, struct rtnetlink_change *change)
if (parsed) {
const struct ifaddrmsg *ifaddr;

ifaddr = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *ifaddr);
ifaddr = ofpbuf_at_assert(buf, NLMSG_HDRLEN, sizeof *ifaddr);

change->nlmsg_type = nlmsg->nlmsg_type;
change->if_index = ifaddr->ifa_index;
Expand Down
2 changes: 1 addition & 1 deletion lib/shash.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ void *
shash_find_and_delete_assert(struct shash *sh, const char *name)
{
void *data = shash_find_and_delete(sh, name);
ovs_assert(data != NULL);
ovs_assert(data);
return data;
}

Expand Down
4 changes: 4 additions & 0 deletions ovsdb/jsonrpc-server.c
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,8 @@ static void
ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *s, struct ovsdb *db,
struct jsonrpc_msg *request)
{
ovs_assert(db);

/* Check for duplicate ID. */
size_t hash = json_hash(request->id, 0);
struct ovsdb_jsonrpc_trigger *t
Expand Down Expand Up @@ -1391,6 +1393,8 @@ ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, struct ovsdb *db,
enum ovsdb_monitor_version version,
const struct json *request_id)
{
ovs_assert(db);

struct ovsdb_jsonrpc_monitor *m = NULL;
struct ovsdb_monitor *dbmon = NULL;
struct json *monitor_id, *monitor_requests;
Expand Down
3 changes: 3 additions & 0 deletions ovsdb/monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,7 @@ ovsdb_monitor_table_add_select(struct ovsdb_monitor *dbmon,
struct ovsdb_monitor_table * mt;

mt = shash_find_data(&dbmon->tables, table->schema->name);
ovs_assert(mt);
mt->select |= select;
}

Expand Down Expand Up @@ -1706,6 +1707,8 @@ ovsdb_monitor_hash(const struct ovsdb_monitor *dbmon, size_t basis)
for (i = 0; i < n; i++) {
struct ovsdb_monitor_table *mt = nodes[i]->data;

ovs_assert(mt);

basis = hash_pointer(mt->table, basis);
basis = hash_3words(mt->select, mt->n_columns, basis);

Expand Down
1 change: 1 addition & 0 deletions ovsdb/ovsdb-server.c
Original file line number Diff line number Diff line change
Expand Up @@ -2262,6 +2262,7 @@ sset_from_json(struct sset *sset, const struct json *array)

sset_clear(sset);

ovs_assert(array);
ovs_assert(array->type == JSON_ARRAY);
for (i = 0; i < array->array.n; i++) {
const struct json *elem = array->array.elems[i];
Expand Down
2 changes: 2 additions & 0 deletions ovsdb/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "storage.h"
#include "table.h"
#include "uuid.h"
#include "util.h"

VLOG_DEFINE_THIS_MODULE(transaction);

Expand Down Expand Up @@ -576,6 +577,7 @@ ovsdb_txn_update_weak_refs(struct ovsdb_txn *txn OVS_UNUSED,
dst_row = CONST_CAST(struct ovsdb_row *,
ovsdb_table_get_row(weak->dst_table, &weak->dst));

ovs_assert(dst_row);
ovs_assert(!ovsdb_row_find_weak_ref(dst_row, weak));
hmap_insert(&dst_row->dst_refs, &weak->dst_node,
ovsdb_weak_ref_hash(weak));
Expand Down
1 change: 1 addition & 0 deletions utilities/ovs-vsctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ vsctl_context_populate_cache(struct ctl_context *ctx)
continue;
}
br = shash_find_data(&vsctl_ctx->bridges, br_cfg->name);
ovs_assert(br);
for (j = 0; j < br_cfg->n_ports; j++) {
struct ovsrec_port *port_cfg = br_cfg->ports[j];
struct vsctl_port *port;
Expand Down
1 change: 1 addition & 0 deletions vtep/vtep-ctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,7 @@ vtep_ctl_context_populate_cache(struct ctl_context *ctx)
continue;
}
ps = shash_find_data(&vtepctl_ctx->pswitches, ps_cfg->name);
ovs_assert(ps);
for (j = 0; j < ps_cfg->n_ports; j++) {
struct vteprec_physical_port *port_cfg = ps_cfg->ports[j];
struct vtep_ctl_port *port;
Expand Down

0 comments on commit bc79a7b

Please sign in to comment.