emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YAEGASHI Takeshi writes:

Browse Source 
Hi,

With the following /etc/fstab (any two or more lines of nfs), mount -a
-t nfs causes a segmentation faults.

server:/exports/aaa /mnt/aaa nfs defaults 0 0
server:/exprots/bbb /mnt/bbb nfs defaults 0 0

In util-linux/nfsmount.c, it overwrites malloc'ed pointer *mount_opts
with a static pointer.  With this patch it does proper memory realloc
and data copy instead.
This commit is contained in:
Eric Andersen 2004-07-26 12:05:12 +00:00
parent 29128cd412
commit 882cec3e40
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/nfsmount.c
View File

@ -315,7 +315,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
char new_opts[1024]; char new_opts[1024];
struct timeval total_timeout; struct timeval total_timeout;
enum clnt_stat clnt_stat; enum clnt_stat clnt_stat;
static struct nfs_mount_data data; struct nfs_mount_data data;
char *opt, *opteq; char *opt, *opteq;
int val; int val;
struct hostent *hp; struct hostent *hp;
@ -602,10 +602,9 @@ int nfsmount(const char *spec, const char *node, int *flags,
#endif #endif
data.version = nfs_mount_version; data.version = nfs_mount_version;
*mount_opts = (char *) &data;
if (*flags & MS_REMOUNT) if (*flags & MS_REMOUNT)
return 0; goto copy_data_and_return;
/* /*
* If the previous mount operation on the same host was * If the previous mount operation on the same host was
@ -857,6 +856,9 @@ int nfsmount(const char *spec, const char *node, int *flags,
auth_destroy(mclient->cl_auth); auth_destroy(mclient->cl_auth);
clnt_destroy(mclient); clnt_destroy(mclient);
close(msock); close(msock);
copy_data_and_return:
*mount_opts = xrealloc(*mount_opts, sizeof(data));
memcpy(*mount_opts, &data, sizeof(data));
return 0; return 0;
/* abort */ /* abort */