diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2010-05-27 03:15:04 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2010-05-27 03:15:04 +0000 |
| commit | 5a4327739c52195c780993710fce9dc10fe7c9b6 (patch) | |
| tree | 1f3e883655f9a5cd377b29684367adba275b4b56 /contrib | |
| parent | 8d0c6fc2265889343804561a37998b02971e6b18 (diff) | |
| download | src-5a4327739c52195c780993710fce9dc10fe7c9b6.tar.gz src-5a4327739c52195c780993710fce9dc10fe7c9b6.zip | |
Change the current working directory to be inside the jail created byreleng/7.2
the jail(8) command. [10:04]
Fix a one-NUL-byte buffer overflow in libopie. [10:05]
Correctly sanity-check a buffer length in nfs mount. [10:06]
Approved by: so (cperciva)
Approved by: re (kensmith)
Security: FreeBSD-SA-10:04.jail
Security: FreeBSD-SA-10:05.opie
Security: FreeBSD-SA-10:06.nfsclient
Notes
Notes:
svn path=/releng/7.2/; revision=208586
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/opie/libopie/readrec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/opie/libopie/readrec.c b/contrib/opie/libopie/readrec.c index f56af7ffb73d..4f204b927eeb 100644 --- a/contrib/opie/libopie/readrec.c +++ b/contrib/opie/libopie/readrec.c @@ -141,10 +141,8 @@ int __opiereadrec FUNCTION((opie), struct opie *opie) if (c = strchr(opie->opie_principal, ':')) *c = 0; - if (strlen(opie->opie_principal) > OPIE_PRINCIPAL_MAX) - (opie->opie_principal)[OPIE_PRINCIPAL_MAX] = 0; - strcpy(principal, opie->opie_principal); + strlcpy(principal, opie->opie_principal, sizeof(principal)); do { if ((opie->opie_recstart = ftell(f)) < 0) |