Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 May 2017 22:02:07 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r318684 - stable/11/sys/fs/nfsclient
Message-ID:  <201705222202.v4MM27cK034238@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rmacklem
Date: Mon May 22 22:02:06 2017
New Revision: 318684
URL: https://svnweb.freebsd.org/changeset/base/318684

Log:
  MFC: r318287
  Make nfscl_mtofh() return ENXIO when *nfhpp == NULL.
  
  r317272 introduced a case where nfscl_mtofh() could return 0 when
  *nfhpp is NULL. This patch makes it return ENXIO for this case.

Modified:
  stable/11/sys/fs/nfsclient/nfs_clcomsubs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/fs/nfsclient/nfs_clcomsubs.c
==============================================================================
--- stable/11/sys/fs/nfsclient/nfs_clcomsubs.c	Mon May 22 21:52:06 2017	(r318683)
+++ stable/11/sys/fs/nfsclient/nfs_clcomsubs.c	Mon May 22 22:02:06 2017	(r318684)
@@ -475,6 +475,7 @@ nfscl_mtofh(struct nfsrv_descript *nd, s
 		if (*++tl != 0) {
 			nd->nd_flag |= ND_NOMOREDATA;
 			flag = 0;
+			error = ENXIO;	/* Return ENXIO so *nfhpp isn't used. */
 		}
 	}
 	if (flag) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705222202.v4MM27cK034238>