From: claudio <claudio@openbsd.org>
Date: Thu, 25 Jan 2024 11:13:35 +0000 (+0000)
Subject: Use RFC7606 treat-as-withdraw for ORIGIN attributes with an invalid value.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6a5cf36aa87b16d9cba4e3500477cbb1e51ed977;p=openbsd

Use RFC7606 treat-as-withdraw for ORIGIN attributes with an invalid value.

OK tb@
---

diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 21526c4efe4..c357ea67a03 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.618 2024/01/25 09:46:12 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.619 2024/01/25 11:13:35 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1983,8 +1983,14 @@ rde_attr_parse(struct ibuf *buf, struct rde_peer *peer,
 		if (ibuf_get_n8(&attrbuf, &a->origin) == -1)
 			goto bad_len;
 		if (a->origin > ORIGIN_INCOMPLETE) {
-			rde_update_err(peer, ERR_UPDATE, ERR_UPD_ORIGIN,
-			    &attrbuf);
+			/*
+			 * mark update as bad and withdraw all routes as per
+			 * RFC 7606
+			 */
+			a->flags |= F_ATTR_PARSE_ERR;
+			log_peer_warnx(&peer->conf, "bad ORIGIN %u, "
+			    "path invalidated and prefix withdrawn",
+			    a->origin);
 			return (-1);
 		}
 		a->flags |= F_ATTR_ORIGIN;