From owner-dev-commits-src-all@freebsd.org Fri Mar 5 00:36:37 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 59B4355F2A9; Fri, 5 Mar 2021 00:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ds81d264qz56Rk; Fri, 5 Mar 2021 00:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B54326F94; Fri, 5 Mar 2021 00:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1250aber098523; Fri, 5 Mar 2021 00:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1250abMV098522; Fri, 5 Mar 2021 00:36:37 GMT (envelope-from git) Date: Fri, 5 Mar 2021 00:36:37 GMT Message-Id: <202103050036.1250abMV098522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 9bf608d00a4f - releng/13.0 - libc: fix buffer overrun in getrpcport(3) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 9bf608d00a4fa2f2028e555cfd1d7e4f8e56bd38 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2021 00:36:37 -0000 The branch releng/13.0 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=9bf608d00a4fa2f2028e555cfd1d7e4f8e56bd38 commit 9bf608d00a4fa2f2028e555cfd1d7e4f8e56bd38 Author: Edward Tomasz Napierala AuthorDate: 2021-01-31 21:41:55 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-03-04 23:29:00 +0000 libc: fix buffer overrun in getrpcport(3) Approved by: re (gjb) Reviewed By: markj Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D27332 (cherry picked from commit 5299d64b2b9f7a25e423ef1785d9402a0ef198d3) (cherry picked from commit a3576b6207074ba5182be253c26af72f8fb51759) --- lib/libc/rpc/getrpcport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c index 2b2d459c8887..4abc9a0c16af 100644 --- a/lib/libc/rpc/getrpcport.c +++ b/lib/libc/rpc/getrpcport.c @@ -62,14 +62,14 @@ getrpcport(char *host, int prognum, int versnum, int proto) assert(host != NULL); - if ((hp = gethostbyname(host)) == NULL) + if ((hp = gethostbyname2(host, AF_INET)) == NULL) return (0); memset(&addr, 0, sizeof(addr)); addr.sin_len = sizeof(struct sockaddr_in); addr.sin_family = AF_INET; addr.sin_port = 0; - if (hp->h_length > addr.sin_len) - hp->h_length = addr.sin_len; + if (hp->h_length > sizeof(addr.sin_addr.s_addr)) + hp->h_length = sizeof(addr.sin_addr.s_addr); memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); /* Inconsistent interfaces need casts! :-( */ return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum,