From owner-svn-src-head@freebsd.org  Wed Jan  4 16:09:47 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 43D9DC9E603;
 Wed,  4 Jan 2017 16:09:47 +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 E34C415D6;
 Wed,  4 Jan 2017 16:09:46 +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 v04G9j59068757;
 Wed, 4 Jan 2017 16:09:45 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v04G9juf068756;
 Wed, 4 Jan 2017 16:09:45 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201701041609.v04G9juf068756@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: Wed, 4 Jan 2017 16:09:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311286 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2017 16:09:47 -0000

Author: kib
Date: Wed Jan  4 16:09:45 2017
New Revision: 311286
URL: https://svnweb.freebsd.org/changeset/base/311286

Log:
  The callers of kern_getfsstat(UIO_SYSSPACE) expect that *buf always
  returns memory which must be freed, regardless of the error.  Assign
  NULL to *buf in case we are not going to allocate any memory due to
  invalid mode.
  
  Reported and tested by:	pho
  Reviewed by:	jhb
  Sponsored by:	The FreeBSD Foundation
  MFC after:	3 weeks (together with r310638)
  Differential revision:	https://reviews.freebsd.org/D9042

Modified:
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Wed Jan  4 16:09:08 2017	(r311285)
+++ head/sys/kern/vfs_syscalls.c	Wed Jan  4 16:09:45 2017	(r311286)
@@ -429,6 +429,8 @@ kern_getfsstat(struct thread *td, struct
 	case MNT_NOWAIT:
 		break;
 	default:
+		if (bufseg == UIO_SYSSPACE)
+			*buf = NULL;
 		return (EINVAL);
 	}
 restart: