From owner-svn-src-stable-11@freebsd.org Thu Feb 23 09:52:23 2017 Return-Path: Delivered-To: svn-src-stable-11@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 B2742CE86D9; Thu, 23 Feb 2017 09:52:23 +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 718CD18AF; Thu, 23 Feb 2017 09:52:23 +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 v1N9qMeh087221; Thu, 23 Feb 2017 09:52:22 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1N9qMiN087220; Thu, 23 Feb 2017 09:52:22 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201702230952.v1N9qMiN087220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 23 Feb 2017 09:52:22 +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: r314135 - stable/11/sys/fs/nfsclient X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2017 09:52:23 -0000 Author: kib Date: Thu Feb 23 09:52:22 2017 New Revision: 314135 URL: https://svnweb.freebsd.org/changeset/base/314135 Log: MFC r313799: Do not allocate char[MNAMELEN] on stack in nfsclient. Modified: stable/11/sys/fs/nfsclient/nfs_clvfsops.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- stable/11/sys/fs/nfsclient/nfs_clvfsops.c Thu Feb 23 09:41:32 2017 (r314134) +++ stable/11/sys/fs/nfsclient/nfs_clvfsops.c Thu Feb 23 09:52:22 2017 (r314135) @@ -749,8 +749,7 @@ static int nfs_mount_parse_from(struct vfsoptlist *opts, char **hostnamep, struct sockaddr_in **sinp, char *dirpath, size_t dirpathsize, int *dirlenp) { - char nam[MNAMELEN + 1]; - char *delimp, *hostp, *spec; + char *nam, *delimp, *hostp, *spec; int error, have_bracket = 0, offset, rv, speclen; struct sockaddr_in *sin; size_t len; @@ -758,6 +757,7 @@ nfs_mount_parse_from(struct vfsoptlist * error = vfs_getopt(opts, "from", (void **)&spec, &speclen); if (error != 0) return (error); + nam = malloc(MNAMELEN + 1, M_TEMP, M_WAITOK); /* * This part comes from sbin/mount_nfs/mount_nfs.c:getnfsargs(). @@ -776,6 +776,7 @@ nfs_mount_parse_from(struct vfsoptlist * hostp = delimp + 1; } else { printf("%s: no : nfs-name\n", __func__); + free(nam, M_TEMP); return (EINVAL); } *delimp = '\0'; @@ -791,6 +792,7 @@ nfs_mount_parse_from(struct vfsoptlist * spec[speclen - 1] = '\0'; if (strlen(hostp) + strlen(spec) + 1 > MNAMELEN) { printf("%s: %s:%s: name too long", __func__, hostp, spec); + free(nam, M_TEMP); return (EINVAL); } /* Make both '@' and ':' notations equal */ @@ -816,6 +818,7 @@ nfs_mount_parse_from(struct vfsoptlist * if (rv != 1) { printf("%s: cannot parse '%s', inet_pton() returned %d\n", __func__, hostp, rv); + free(nam, M_TEMP); free(sin, M_SONAME); return (EINVAL); } @@ -832,6 +835,7 @@ nfs_mount_parse_from(struct vfsoptlist * strlcpy(dirpath, spec, dirpathsize); *dirlenp = strlen(dirpath); + free(nam, M_TEMP); return (0); } @@ -874,7 +878,7 @@ nfs_mount(struct mount *mp) struct sockaddr *nam = NULL; struct vnode *vp; struct thread *td; - char hst[MNAMELEN]; + char *hst; u_char nfh[NFSX_FHMAX], krbname[100], dirpath[100], srvkrbname[100]; char *cp, *opt, *name, *secname; int nametimeo = NFS_DEFAULT_NAMETIMEO; @@ -886,6 +890,7 @@ nfs_mount(struct mount *mp) has_nfs_args_opt = 0; has_nfs_from_opt = 0; + hst = malloc(MNAMELEN, M_TEMP, M_WAITOK); if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) { error = EINVAL; goto out; @@ -1324,6 +1329,7 @@ out: mp->mnt_kern_flag |= MNTK_NULL_NOCACHE; MNT_IUNLOCK(mp); } + free(hst, M_TEMP); return (error); }