From owner-dev-commits-src-branches@freebsd.org Mon Jun 7 00:30:00 2021 Return-Path: <owner-dev-commits-src-branches@freebsd.org> Delivered-To: dev-commits-src-branches@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 9ABDD643006; Mon, 7 Jun 2021 00:30:00 +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 4FyvQc40Zlz4qq8; Mon, 7 Jun 2021 00:30:00 +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 719264CDB; Mon, 7 Jun 2021 00:30:00 +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 1570U0NT046276; Mon, 7 Jun 2021 00:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1570U0w7046265; Mon, 7 Jun 2021 00:30:00 GMT (envelope-from git) Date: Mon, 7 Jun 2021 00:30:00 GMT Message-Id: <202106070030.1570U0w7046265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik <mjg@FreeBSD.org> Subject: git: 033820ace724 - stable/13 - nfs: even up value returned by nfsrv_parsename with copyinstr MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 033820ace7241fce49066a88c622d15a194fac00 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>, <mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/> List-Post: <mailto:dev-commits-src-branches@freebsd.org> List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>, <mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 07 Jun 2021 00:30:00 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=033820ace7241fce49066a88c622d15a194fac00 commit 033820ace7241fce49066a88c622d15a194fac00 Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2021-05-31 16:32:04 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2021-06-07 00:29:38 +0000 nfs: even up value returned by nfsrv_parsename with copyinstr Reported by: dim Reviewed by: rmacklem (cherry picked from commit 68c254426467e3f900f9a19de4dd9a234ea75388) --- sys/fs/nfsserver/nfs_nfsdsubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index 49c5cac999c7..d407dad8367d 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -2064,7 +2064,7 @@ nfsrv_parsename(struct nfsrv_descript *nd, char *bufp, u_long *hashp, } } *tocp = '\0'; - *outlenp = (size_t)outlen; + *outlenp = (size_t)outlen + 1; if (hashp != NULL) *hashp = hash; nfsmout: