svn commit: r222075 - in head/sys: fs/nfsclient nfsclient
Rick Macklem
rmacklem at FreeBSD.org
Wed May 18 18:36:41 UTC 2011
Author: rmacklem
Date: Wed May 18 18:36:40 2011
New Revision: 222075
URL: http://svn.freebsd.org/changeset/base/222075
Log:
Add a sanity check for the existence of an "addr" option
to both NFS clients. This avoids the crash reported by
Sergey Kandaurov (pluknet at gmail.com) to the freebsd-fs@
list with subject "[old nfsclient] different nmount()
args passed from mount vs mount_nfs" dated May 17, 2011.
Tested by: pluknet at gmail.com (old nfs client)
MFC after: 2 weeks
Modified:
head/sys/fs/nfsclient/nfs_clvfsops.c
head/sys/nfsclient/nfs_vfsops.c
Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c Wed May 18 17:39:28 2011 (r222074)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c Wed May 18 18:36:40 2011 (r222075)
@@ -1079,15 +1079,21 @@ nfs_mount(struct mount *mp)
dirpath[0] = '\0';
dirlen = strlen(dirpath);
- if (has_nfs_args_opt == 0 && vfs_getopt(mp->mnt_optnew, "addr",
- (void **)&args.addr, &args.addrlen) == 0) {
- if (args.addrlen > SOCK_MAXADDRLEN) {
- error = ENAMETOOLONG;
+ if (has_nfs_args_opt == 0) {
+ if (vfs_getopt(mp->mnt_optnew, "addr",
+ (void **)&args.addr, &args.addrlen) == 0) {
+ if (args.addrlen > SOCK_MAXADDRLEN) {
+ error = ENAMETOOLONG;
+ goto out;
+ }
+ nam = malloc(args.addrlen, M_SONAME, M_WAITOK);
+ bcopy(args.addr, nam, args.addrlen);
+ nam->sa_len = args.addrlen;
+ } else {
+ vfs_mount_error(mp, "No server address");
+ error = EINVAL;
goto out;
}
- nam = malloc(args.addrlen, M_SONAME, M_WAITOK);
- bcopy(args.addr, nam, args.addrlen);
- nam->sa_len = args.addrlen;
}
args.fh = nfh;
Modified: head/sys/nfsclient/nfs_vfsops.c
==============================================================================
--- head/sys/nfsclient/nfs_vfsops.c Wed May 18 17:39:28 2011 (r222074)
+++ head/sys/nfsclient/nfs_vfsops.c Wed May 18 18:36:40 2011 (r222075)
@@ -1149,6 +1149,10 @@ nfs_mount(struct mount *mp)
goto out;
}
}
+ } else if (has_addr_opt == 0) {
+ vfs_mount_error(mp, "No server address");
+ error = EINVAL;
+ goto out;
}
error = mountnfs(&args, mp, nam, args.hostname, &vp,
curthread->td_ucred, negnametimeo);
More information about the svn-src-head
mailing list