[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/20] 9p: proxy: Fix size passed to `connect`
From: |
Keno Fischer |
Subject: |
[Qemu-devel] [PATCH v2 02/20] 9p: proxy: Fix size passed to `connect` |
Date: |
Thu, 31 May 2018 21:25:57 -0400 |
The size to pass to the `connect` call is the size of the entire
`struct sockaddr_un`. Passing anything shorter than this causes errors
on darwin.
Signed-off-by: Keno Fischer <address@hidden>
---
Changes since v1: New patch
hw/9pfs/9p-proxy.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index e2e0329..47a94e0 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -1088,7 +1088,7 @@ static int proxy_ioc_getversion(FsContext *fs_ctx,
V9fsPath *path,
static int connect_namedsocket(const char *path, Error **errp)
{
- int sockfd, size;
+ int sockfd;
struct sockaddr_un helper;
if (strlen(path) >= sizeof(helper.sun_path)) {
@@ -1102,8 +1102,7 @@ static int connect_namedsocket(const char *path, Error
**errp)
}
strcpy(helper.sun_path, path);
helper.sun_family = AF_UNIX;
- size = strlen(helper.sun_path) + sizeof(helper.sun_family);
- if (connect(sockfd, (struct sockaddr *)&helper, size) < 0) {
+ if (connect(sockfd, (struct sockaddr *)&helper, sizeof(helper)) < 0) {
error_setg_errno(errp, errno, "failed to connect to '%s'", path);
close(sockfd);
return -1;
--
2.8.1
- [Qemu-devel] [PATCH v2 00/20] 9p: Add support for Darwin, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 01/20] cutils: Provide strchrnul, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 02/20] 9p: proxy: Fix size passed to `connect`,
Keno Fischer <=
- [Qemu-devel] [PATCH v2 06/20] 9p: Avoid warning if FS_IOC_GETVERSION is not defined, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 03/20] 9p: xattr: Fix crash due to free of uninitialized value, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 05/20] 9p: Properly set errp in fstatfs error path, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 04/20] 9p: linux: Fix a couple Linux assumptions, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 07/20] 9p: Move a couple xattr functions to 9p-util, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 11/20] 9p: darwin: Handle struct dirent differences, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 08/20] 9p: Rename 9p-util -> 9p-util-linux, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 09/20] 9p: Properly check/translate flags in unlinkat, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 10/20] 9p: darwin: Handle struct stat(fs) differences, Keno Fischer, 2018/05/31
- [Qemu-devel] [PATCH v2 12/20] 9p: darwin: Explicitly cast comparisons of mode_t with -1, Keno Fischer, 2018/05/31