From 5fc6dbae7416d7be38565391d4c213fa9085c9fb Mon Sep 17 00:00:00 2001 From: M. Mohan Kumar Date: Thu, 19 Jan 2012 16:15:56 +0530 Subject: fsdev: Fix parameter parsing for proxy helper This fixes a crash when using sockfd with proxy FsDriver Signed-off-by: M. Mohan Kumar Signed-off-by: Aneesh Kumar K.V --- fsdev/virtfs-proxy-helper.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'fsdev') diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 4a507d860e..f9a8270ee9 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -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; -- cgit v1.2.3-55-g7522