From owner-svn-src-stable@freebsd.org Wed Apr 4 13:15:13 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3D65F8DD04; Wed, 4 Apr 2018 13:15:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 925A27A4D2; Wed, 4 Apr 2018 13:15:12 +0000 (UTC) (envelope-from emaste@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 8D58B1430E; Wed, 4 Apr 2018 13:15:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w34DFChS064311; Wed, 4 Apr 2018 13:15:12 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w34DFCAR064310; Wed, 4 Apr 2018 13:15:12 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201804041315.w34DFCAR064310@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 4 Apr 2018 13:15:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332022 - stable/11/sys/fs/fuse X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/sys/fs/fuse X-SVN-Commit-Revision: 332022 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.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2018 13:15:13 -0000 Author: emaste Date: Wed Apr 4 13:15:12 2018 New Revision: 332022 URL: https://svnweb.freebsd.org/changeset/base/332022 Log: MFC r330354 (eadler): sys/fuse: fix off by one error Reported by: Ilja Van Sprundel Submitted by: Domagoj Stolfa Modified: stable/11/sys/fs/fuse/fuse_internal.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/fuse/fuse_internal.c ============================================================================== --- stable/11/sys/fs/fuse/fuse_internal.c Wed Apr 4 13:12:49 2018 (r332021) +++ stable/11/sys/fs/fuse/fuse_internal.c Wed Apr 4 13:15:12 2018 (r332022) @@ -355,7 +355,7 @@ fuse_internal_readdir_processdata(struct uio *uio, memcpy((char *)cookediov->base + sizeof(struct dirent) - MAXNAMLEN - 1, (char *)buf + FUSE_NAME_OFFSET, fudge->namelen); - ((char *)cookediov->base)[bytesavail] = '\0'; + ((char *)cookediov->base)[bytesavail - 1] = '\0'; err = uiomove(cookediov->base, cookediov->len, uio); if (err) {