From owner-svn-src-projects@freebsd.org Sun Jul 26 02:51:01 2020 Return-Path: Delivered-To: svn-src-projects@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 6D6A937A2CA for ; Sun, 26 Jul 2020 02:51:01 +0000 (UTC) (envelope-from rmacklem@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 4BDnW9269lz40r8; Sun, 26 Jul 2020 02:51:01 +0000 (UTC) (envelope-from rmacklem@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 2CDDF25E21; Sun, 26 Jul 2020 02:51:01 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06Q2p1E3051092; Sun, 26 Jul 2020 02:51:01 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06Q2p10p051091; Sun, 26 Jul 2020 02:51:01 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202007260251.06Q2p10p051091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 26 Jul 2020 02:51:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363542 - projects/nfs-over-tls/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/fs/nfsserver X-SVN-Commit-Revision: 363542 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2020 02:51:01 -0000 Author: rmacklem Date: Sun Jul 26 02:51:00 2020 New Revision: 363542 URL: https://svnweb.freebsd.org/changeset/base/363542 Log: Fix up comments and add a KASSERT() to nfsrv_adj(). Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c Sun Jul 26 02:42:09 2020 (r363541) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c Sun Jul 26 02:51:00 2020 (r363542) @@ -1299,8 +1299,8 @@ nfsrv_adj(struct mbuf *mp, int len, int nul) break; m = m->m_next; } - /* m is now the last mbuf and tlen the total length. */ + if (len >= m->m_len) { /* Need to trim away the last mbuf(s). */ i = tlen - len; @@ -1315,7 +1315,12 @@ nfsrv_adj(struct mbuf *mp, int len, int nul) } else lastlen = m->m_len - len; - /* Adjust the last mbuf. */ + /* + * m is now the last mbuf after trimming and its length needs to + * be lastlen. + * Adjust the last mbuf and set cp to point to where nuls must be + * written. + */ if ((m->m_flags & M_EXTPG) != 0) { pgno = m->m_epg_npgs - 1; off = (pgno == 0) ? m->m_epg_1st_off : 0; @@ -1324,6 +1329,8 @@ nfsrv_adj(struct mbuf *mp, int len, int nul) /* Trim this mbuf. */ trim = m->m_len - lastlen; while (trim >= plen) { + KASSERT(pgno > 0, + ("nfsrv_adj: freeing page 0")); /* Free page. */ pg = PHYS_TO_VM_PAGE(m->m_epg_pa[pgno]); vm_page_unwire_noq(pg);