diff options
| author | imp <imp@FreeBSD.org> | 1997-12-24 00:58:39 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1997-12-24 00:58:39 +0000 |
| commit | 6356793b9936dd229c309d412e2473c090fbde63 (patch) | |
| tree | 8294ef4f79357d3a63a0506d1ad893f69a24cc20 /sbin | |
| parent | fb787b8d6adfec597d90e7b3d696fcbdedb5ab07 (diff) | |
| download | FreeBSD-src-6356793b9936dd229c309d412e2473c090fbde63.zip FreeBSD-src-6356793b9936dd229c309d412e2473c090fbde63.tar.gz | |
Be extra paranoid about trusting the length returned by gethostbyaddr.
Submitted by: Julian Assange
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/mount_nfs/mount_nfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index efe52a2..246c40a 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -45,7 +45,7 @@ static char copyright[] = static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95"; */ static const char rcsid[] = - "$Id: mount_nfs.c,v 1.23 1997/06/03 13:49:26 dfr Exp $"; + "$Id: mount_nfs.c,v 1.24 1997/10/19 16:40:01 joerg Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -694,7 +694,7 @@ getnfsargs(spec, nfsargsp) return (0); } } else if ((hp = gethostbyname(hostp)) != NULL) - memmove(&saddr.sin_addr, hp->h_addr, hp->h_length); + memmove(&saddr.sin_addr, hp->h_addr, MIN(hp->h_length, sizeof(saddr.sin_addr))); else { warnx("can't get net id for host"); return (0); @@ -706,7 +706,7 @@ getnfsargs(spec, nfsargsp) warnx("can't reverse resolve net address"); return (0); } - memmove(&saddr.sin_addr, hp->h_addr, hp->h_length); + memmove(&saddr.sin_addr, hp->h_addr, MIN(hp->h_length, sizeof(saddr.sin_addr))); strncpy(inst, hp->h_name, INST_SZ); inst[INST_SZ - 1] = '\0'; if (cp = strchr(inst, '.')) |
