cps: correct returned error code for RTM_DELROUTE

AltraMayor · AltraMayor · commit 538665fefe81 · 2021-09-15T14:22:58.000-04:00
Although the Linux kernel uses ENOENT for similar situations (e.g.
when RTM_NEWROUTE tries to replace an entry that does not exist),
it uses ESRCH for RTM_DELROUTE.  Thus, this patch replaces ENOENT
with ESRCH when returning a not-found error for RTM_DELROUTE.

This patch was motivated by many enigmatic log entries from Bird
like this one:
&lt;DATE&gt; &lt;SERVER&gt; bird[&lt;PID&gt;]: Netlink: No such file or directory
diff --git a/cps/rd.c b/cps/rd.c
@@ -289,20 +289,31 @@ static int
 del_route(struct route_update *update, const struct cps_config *cps_conf)
 {
 	struct gk_fib *prefix_fib;
-	int ret;
 
-	ret = get_prefix_fib(update, &cps_conf->gk->lpm_tbl, &prefix_fib);
+	int ret = get_prefix_fib(update, &cps_conf->gk->lpm_tbl, &prefix_fib);
 	if (ret < 0)
-		return ret;
+		goto error;
 
-	if (prefix_fib == NULL)
-		return -ENOENT;
+	if (prefix_fib == NULL) {
+		ret = -ENOENT;
+		goto error;
+	}
 
 	ret = can_rd_del_route(update, prefix_fib);
 	if (ret < 0)
-		return ret;
+		goto error;
 
-	return del_fib_entry_numerical(&update->prefix_info, cps_conf->gk);
+	ret = del_fib_entry_numerical(&update->prefix_info, cps_conf->gk);
+
+error:
+	/*
+	 * Although the Linux kernel uses ENOENT for similar situations (e.g.
+	 * when RTM_NEWROUTE tries to replace an entry that does not exist),
+	 * it uses ESRCH for RTM_DELROUTE.
+	 */
+	if (ret == -ENOENT)
+		return -ESRCH;
+	return ret;
 }
 
 /*
