From: tb <tb@openbsd.org>
Date: Wed, 2 Nov 2022 11:28:36 +0000 (+0000)
Subject: Length check URI before strncasecmp()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3b405428c938f2c0c4fa4849c56380774b3c1043;p=openbsd

Length check URI before strncasecmp()

A priori URI is not NUL terminated, so we should first check it is long
enough before comparing it against proto. As a side effect, this now
rejects "https://" and "rsync://", which are invalid due to the missing
host in the authority section.

ok claudio
---

diff --git a/usr.sbin/rpki-client/validate.c b/usr.sbin/rpki-client/validate.c
index f1a63f6c91b..71d08236084 100644
--- a/usr.sbin/rpki-client/validate.c
+++ b/usr.sbin/rpki-client/validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: validate.c,v 1.45 2022/09/03 14:41:47 job Exp $ */
+/*	$OpenBSD: validate.c,v 1.46 2022/11/02 11:28:36 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -290,6 +290,8 @@ valid_uri(const char *uri, size_t usz, const char *proto)
 
 	if (proto != NULL) {
 		s = strlen(proto);
+		if (s >= usz)
+			return 0;
 		if (strncasecmp(uri, proto, s) != 0)
 			return 0;
 	}