Minor vSockets fixes
Subsystems (5)
cover Minor vSockets fixes
Minor vSockets fixes, two of which were reported on LKML.
Andy King (2):
VSOCK: Remove hypervisor-only socket option
VSOCK: Don't reject PF_VSOCK protocol
Dmitry Torokhov (2):
VSOCK: get rid of EXPORT_SYMTAB
VSOCK: get rid of vsock_version.h
include/uapi/linux/vm_sockets.h | 8 -------- net/vmw_vsock/af_vsock.c | 7 ++----- net/vmw_vsock/vmci_transport.c | 2 -- net/vmw_vsock/vsock_version.h | 22 ---------------------- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 net/vmw_vsock/vsock_version.h
Signature · 1 line
1.7.4.1
PATCH 1/4 VSOCK: get rid of EXPORT_SYMTAB
From: Dmitry Torokhov <[email protected]>
This is the default behavior for a looooooong time.
--- net/vmw_vsock/af_vsock.c | 2 -- net/vmw_vsock/vmci_transport.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-)
net/vmw_vsock/af_vsock.c +0 -2
@@ -76,8 +76,6 @@*/ #include <linux/types.h> - -#define EXPORT_SYMTAB #include <linux/bitops.h> #include <linux/cred.h> #include <linux/init.h>
net/vmw_vsock/vmci_transport.c +0 -2
@@ -14,8 +14,6 @@*/ #include <linux/types.h> - -#define EXPORT_SYMTAB #include <linux/bitops.h> #include <linux/cred.h> #include <linux/init.h>
Signature · 1 line
1.7.4.1
PATCH 2/4 VSOCK: get rid of vsock_version.h
In reply to Andy KingFrom: Dmitry Torokhov <[email protected]>
There isn't really a need to have a separate file for it.
--- net/vmw_vsock/af_vsock.c | 3 +-- net/vmw_vsock/vsock_version.h | 22 ---------------------- 2 files changed, 1 insertions(+), 24 deletions(-) delete mode 100644 net/vmw_vsock/vsock_version.h
net/vmw_vsock/af_vsock.c +1 -2
@@ -98,7 +98,6 @@#include <net/sock.h> #include "af_vsock.h" -#include "vsock_version.h" static int __vsock_bind (struct sock *sk,struct sockaddr_vm *addr);static void vsock_sk_destruct (struct sock *sk);
@@ -2009,5 +2008,5 @@ EXPORT_SYMBOL_GPL(vsock_core_exit);MODULE_AUTHOR ("VMware, Inc." );MODULE_DESCRIPTION ("VMware Virtual Socket Family" ); -MODULE_VERSION (VSOCK_DRIVER_VERSION_STRING ); +MODULE_VERSION ("1.0.0.0-k" );MODULE_LICENSE ("GPL v2" );
net/vmw_vsock/vsock_version.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* -* VMware vSockets Driver -* -* Copyright (C) 2011-2012 VMware, Inc. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation version 2 and no later version. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -*/ - -#ifndef _VSOCK_VERSION_H_ -#define _VSOCK_VERSION_H_ - -#define VSOCK_DRIVER_VERSION_PARTS { 1, 0, 0, 0 } -#define VSOCK_DRIVER_VERSION_STRING "1.0.0.0-k" - -#endif /* _VSOCK_VERSION_H_ */
Signature · 1 line
1.7.4.1
PATCH 3/4 VSOCK: Remove hypervisor-only socket option
In reply to Andy KingRemove hypervisor-only socket option.
--- include/uapi/linux/vm_sockets.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
include/uapi/linux/vm_sockets.h +0 -8
@@ -52,14 +52,6 @@#define SO_VM_SOCKETS_PEER_HOST_VM_ID 3 -/* Option name for socket's service label. Use as the option name in -* setsockopt(3) or getsockopt(3) to set or get the service label for a socket. -* The service label is a C-style NUL-terminated string. Only available for -* hypervisor endpoints. -*/ - -#define SO_VM_SOCKETS_SERVICE_LABEL 4 -/* Option name for determining if a socket is trusted. Use as the option name * in getsockopt(3) to determine if a socket is trusted. The value is a * signed integer.
Signature · 1 line
1.7.4.1
PATCH 4/4 VSOCK: Don't reject PF_VSOCK protocol
In reply to Andy KingAllow our own family as the protocol value for socket creation.
--- net/vmw_vsock/af_vsock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/vmw_vsock/af_vsock.c +1 -1
@@ -1860,7 +1860,7 @@ static int vsock_create(struct net *net, struct socket *sock,if (!sock)return -EINVAL ; -if (protocol) +if (protocol && protocol !=PF_VSOCK )return -EPROTONOSUPPORT ;switch (sock->type) {
Signature · 1 line
1.7.4.1
David Miller
maintainerFrom: Andy King <[email protected]>
Date: Mon, 18 Feb 2013 08:04:09 -0800
Quoted 1 line
Minor vSockets fixes, two of which were reported on LKML.
Series applied, thanks.