[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] 9p: proxy: Fix size passed to `connect`
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 1/7] 9p: proxy: Fix size passed to `connect` |
Date: |
Thu, 7 Jun 2018 17:21:13 +0200 |
From: Keno Fischer <address@hidden>
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>
Signed-off-by: Greg Kurz <address@hidden>
---
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 e2e03292de2c..47a94e088daa 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.14.4
- [Qemu-devel] [PULL 0/7] 9p patches 2018-06-07, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 4/7] 9p: xattr: Fix crashes due to free of uninitialized value, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 5/7] 9p: local: Avoid warning if FS_IOC_GETVERSION is not defined, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 6/7] 9p: Properly check/translate flags in unlinkat, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 2/7] 9p: local: Properly set errp in fstatfs error path, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 1/7] 9p: proxy: Fix size passed to `connect`,
Greg Kurz <=
- [Qemu-devel] [PULL 3/7] 9p: Move a couple xattr functions to 9p-util, Greg Kurz, 2018/06/07
- [Qemu-devel] [PULL 7/7] 9p: xattr: Properly translate xattrcreate flags, Greg Kurz, 2018/06/07
- Re: [Qemu-devel] [PULL 0/7] 9p patches 2018-06-07, Peter Maydell, 2018/06/08