From owner-svn-src-releng@freebsd.org  Tue Jul  4 05:38:00 2017
Return-Path: <owner-svn-src-releng@freebsd.org>
Delivered-To: svn-src-releng@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10BC99F7884;
 Tue,  4 Jul 2017 05:38:00 +0000 (UTC) (envelope-from kib@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 mx1.freebsd.org (Postfix) with ESMTPS id CEDB96AFDB;
 Tue,  4 Jul 2017 05:37:59 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v645bw2j020409;
 Tue, 4 Jul 2017 05:37:58 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v645bwUK020408;
 Tue, 4 Jul 2017 05:37:58 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201707040537.v645bwUK020408@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 4 Jul 2017 05:37:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r320639 - releng/11.1/sys/kern
X-SVN-Group: releng
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: releng/11.1/sys/kern
X-SVN-Commit-Revision: 320639
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-releng>, 
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jul 2017 05:38:00 -0000

Author: kib
Date: Tue Jul  4 05:37:58 2017
New Revision: 320639
URL: https://svnweb.freebsd.org/changeset/base/320639

Log:
  MFC r320422:
  Do not ignore an error from vm_mmap_object().
  
  Approved by:	re (delphij)

Modified:
  releng/11.1/sys/kern/uipc_shm.c
Directory Properties:
  releng/11.1/   (props changed)

Modified: releng/11.1/sys/kern/uipc_shm.c
==============================================================================
--- releng/11.1/sys/kern/uipc_shm.c	Tue Jul  4 04:53:21 2017	(r320638)
+++ releng/11.1/sys/kern/uipc_shm.c	Tue Jul  4 05:37:58 2017	(r320639)
@@ -906,7 +906,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *a
 	    shmfd->shm_object, foff, FALSE, td);
 	if (error != 0)
 		vm_object_deallocate(shmfd->shm_object);
-	return (0);
+	return (error);
 }
 
 static int