sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

fsdev: Fix parameter parsing for proxy helper 

This fixes a crash when using sockfd with proxy FsDriver

Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
M. Mohan Kumar 2012-01-19 16:15:56 +05:30 committed by Aneesh Kumar K.V
parent 71f86cd6f3
commit 5fc6dbae74
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fsdev/virtfs-proxy-helper.c
View File

@ -1036,7 +1036,13 @@ int main(int argc, char **argv)
return -1;
}
if (*sock_name && (own_u == -1 || own_g == -1)) {
if (sock_name && sock != -1) {
fprintf(stderr, "both named socket and socket descriptor specified\n");
usage(argv[0]);
exit(EXIT_FAILURE);
}
if (sock_name && (own_u == -1 || own_g == -1)) {
fprintf(stderr, "owner uid:gid not specified, ");
fprintf(stderr,
"owner uid:gid specifies who can access the socket file\n");
@ -1064,7 +1070,7 @@ int main(int argc, char **argv)
}
do_log(LOG_INFO, "Started\n");
if (*sock_name) {
if (sock_name) {
sock = proxy_socket(sock_name, own_u, own_g);
if (sock < 0) {
goto error;