d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It turns out that set_charset() invokes build_iovec() which modifies

Browse Source 
iov address internally through realloc(3).  However, since the function
parameter wasn't designed to allow the modified iov being passed back to
the caller, we end up feeding iov with several corrupted entries(depends on
how many arguments were pushed into iovec before set_charset()) to nmount(2).

This commit fixes this regression introduced in rev1.31 such that
mount_cd9660(8) with code page conversion option(-C) enabled works again.

Reviewed by:	rodrigc
This commit is contained in:
Tai-hwa Liang 2005-11-25 19:48:53 +00:00
parent 38e00d27ea
commit 4acc9672b5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=152808
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/mount_cd9660/mount_cd9660.c
View File

@ -75,7 +75,7 @@ struct mntopt mopts[] = {
};
static int get_ssector(const char *dev);
static int set_charset(struct iovec *, int *iovlen, const char *);
static int set_charset(struct iovec **, int *iovlen, const char *);
void usage(void);
int
@ -128,7 +128,7 @@ main(int argc, char **argv)
verbose++;
break;
case 'C':
if (set_charset(iov, &iovlen, optarg) == -1)
if (set_charset(&iov, &iovlen, optarg) == -1)
err(EX_OSERR, "cd9660_iconv");
build_iovec(&iov, &iovlen, "kiconv", NULL, (size_t)-1);
break;
@ -234,7 +234,7 @@ get_ssector(const char *dev)
}
static int
set_charset(struct iovec *iov, int *iovlen, const char *localcs)
set_charset(struct iovec **iov, int *iovlen, const char *localcs)
{
int error;
char *cs_disk; /* disk charset for Joliet cs conversion */
@ -260,8 +260,8 @@ set_charset(struct iovec *iov, int *iovlen, const char *localcs)
if (error)
return (-1);
build_iovec(&iov, iovlen, "cs_disk", cs_disk, (size_t)-1);
build_iovec(&iov, iovlen, "cs_local", cs_local, (size_t)-1);
build_iovec(iov, iovlen, "cs_disk", cs_disk, (size_t)-1);
build_iovec(iov, iovlen, "cs_local", cs_local, (size_t)-1);
return (0);
}