From owner-svn-src-stable@freebsd.org Thu Nov 26 23:34:03 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 31B1E4749ED;
Thu, 26 Nov 2020 23:34:03 +0000 (UTC)
(envelope-from asomers@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 "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4ChvGg0wbXz3p1g;
Thu, 26 Nov 2020 23:34:03 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 129473C21;
Thu, 26 Nov 2020 23:34:03 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AQNY2Ym044290;
Thu, 26 Nov 2020 23:34:02 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AQNY2Mt044289;
Thu, 26 Nov 2020 23:34:02 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <202011262334.0AQNY2Mt044289@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 26 Nov 2020 23:34:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r368085 - stable/12/lib/libc/gen
X-SVN-Group: stable-12
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/12/lib/libc/gen
X-SVN-Commit-Revision: 368085
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Nov 2020 23:34:03 -0000
Author: asomers
Date: Thu Nov 26 23:34:02 2020
New Revision: 368085
URL: https://svnweb.freebsd.org/changeset/base/368085
Log:
MFC r365910:
fix integer underflow in getgrnam_r and getpwnam_r
Sometimes nscd(8) will return a 1-byte buffer for a nonexistent entry. This
triggered an integer underflow in grp_unmarshal_func, causing getgrnam_r to
return ERANGE instead of 0.
Fix the user's buffer size check, and add a correct check for a too-small
nscd buffer.
PR: 248932
Event: September 2020 Bugathon
Reviewed by: markj
Sponsored by: Axcient
Differential Revision: https://reviews.freebsd.org/D26204
Modified:
stable/12/lib/libc/gen/getgrent.c
stable/12/lib/libc/gen/getpwent.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/gen/getgrent.c
==============================================================================
--- stable/12/lib/libc/gen/getgrent.c Thu Nov 26 22:49:05 2020 (r368084)
+++ stable/12/lib/libc/gen/getgrent.c Thu Nov 26 23:34:02 2020 (r368085)
@@ -334,14 +334,27 @@ grp_unmarshal_func(char *buffer, size_t buffer_size, v
orig_buf_size = va_arg(ap, size_t);
ret_errno = va_arg(ap, int *);
- if (orig_buf_size <
- buffer_size - sizeof(struct group) - sizeof(char *)) {
+ if (orig_buf_size + sizeof(struct group) + sizeof(char *) < buffer_size)
+ {
*ret_errno = ERANGE;
return (NS_RETURN);
+ } else if (buffer_size < sizeof(struct group) + sizeof(char *)) {
+ /*
+ * nscd(8) sometimes returns buffer_size=1 for nonexistent
+ * entries.
+ */
+ *ret_errno = 0;
+ return (NS_NOTFOUND);
}
memcpy(grp, buffer, sizeof(struct group));
memcpy(&p, buffer + sizeof(struct group), sizeof(char *));
+
+ if (orig_buf_size + sizeof(struct group) + sizeof(char *) +
+ _ALIGN(p) - (size_t)p < buffer_size) {
+ *ret_errno = ERANGE;
+ return (NS_RETURN);
+ }
orig_buf = (char *)_ALIGN(orig_buf);
memcpy(orig_buf, buffer + sizeof(struct group) + sizeof(char *) +
Modified: stable/12/lib/libc/gen/getpwent.c
==============================================================================
--- stable/12/lib/libc/gen/getpwent.c Thu Nov 26 22:49:05 2020 (r368084)
+++ stable/12/lib/libc/gen/getpwent.c Thu Nov 26 23:34:02 2020 (r368085)
@@ -389,10 +389,17 @@ pwd_unmarshal_func(char *buffer, size_t buffer_size, v
orig_buf_size = va_arg(ap, size_t);
ret_errno = va_arg(ap, int *);
- if (orig_buf_size <
- buffer_size - sizeof(struct passwd) - sizeof(char *)) {
+ if (orig_buf_size + sizeof(struct passwd) + sizeof(char *) <
+ buffer_size) {
*ret_errno = ERANGE;
return (NS_RETURN);
+ } else if (buffer_size < sizeof(struct passwd) + sizeof(char *)) {
+ /*
+ * nscd(8) sometimes returns buffer_size=1 for nonexistent
+ * entries.
+ */
+ *ret_errno = 0;
+ return (NS_NOTFOUND);
}
memcpy(pwd, buffer, sizeof(struct passwd));