From 7abf6822b74ab062f5c1fe4dbdff66bbb18e6b74 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 12 Feb 2020 15:51:29 +0000
Subject: MFC r357575: Improve validation of the sockaddr length in
 iruserok_sa().

PR:	243747
---
 lib/libc/net/rcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/libc/net')

diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 3cb475a6bece..e8b4ffd356c4 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -438,8 +438,8 @@ iruserok_sa(const void *ra, int rlen, int superuser, const char *ruser,
 	struct sockaddr_storage ss;
 
 	/* avoid alignment issue */
-	if (rlen > sizeof(ss)) 
-		return(-1);
+	if (rlen <= 0 || rlen > sizeof(ss))
+		return (-1);
 	memcpy(&ss, ra, rlen);
 	raddr = (struct sockaddr *)&ss;
 
-- 
cgit v1.3