linux-toradex.git/net/vmw_vsock, branch v3.10.8

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-30T07:55:20+00:00

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller

VSOCK: Drop bogus __init annotation from vsock_init_tables()

2013-04-25T08:21:51+00:00

If gcc (e.g. 4.1.2) decides not to inline vsock_init_tables(), this will
cause a section mismatch:

WARNING: net/vmw_vsock/vsock.o(.text+0x1bc): Section mismatch in reference from the function __vsock_core_init() to the function .init.text:vsock_init_tables()
The function __vsock_core_init() references
the function __init vsock_init_tables().
This is often because __vsock_core_init lacks a __init
annotation or the annotation of vsock_init_tables is wrong.

This may cause crashes if VSOCKETS=y and VMWARE_VMCI_VSOCKETS=m.

Signed-off-by: Geert Uytterhoeven 
Signed-off-by: David S. Miller

VSOCK: Fix misc device registration

2013-04-25T08:21:22+00:00

When we call vsock_core_init to init VSOCK the second time,
vsock_device.minor still points to the old dynamically allocated minor
number. misc_register will allocate it for us successfully as if we were
asking for a static one. However, when other user call misc_register to
allocate a dynamic minor number, it will give the one used by
vsock_core_init(), causing this:

  [  405.470687] WARNING: at fs/sysfs/dir.c:536 sysfs_add_one+0xcc/0xf0()
  [  405.470689] Hardware name: OptiPlex 790
  [  405.470690] sysfs: cannot create duplicate filename '/dev/char/10:54'

Always set vsock_device.minor to MISC_DYNAMIC_MINOR before we
register.

Cc: "David S. Miller" 
Cc: Andy King 
Cc: Dmitry Torokhov 
Cc: Reilly Grant 
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Asias He 
Acked-by: Dmitry Torokhov 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-07T22:37:01+00:00

Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller

VSOCK: Fix missing msg_namelen update in vsock_stream_recvmsg()

2013-04-07T20:28:02+00:00

The code misses to update the msg_namelen member to 0 and therefore
makes net/socket.c leak the local, uninitialized sockaddr_storage
variable to userland -- 128 bytes of kernel stack memory.

Cc: Andy King 
Cc: Dmitry Torokhov 
Cc: George Zhang 
Signed-off-by: Mathias Krause 
Signed-off-by: David S. Miller

VSOCK: vmci - fix possible info leak in vmci_transport_dgram_dequeue()

2013-04-07T20:28:02+00:00

In case we received no data on the call to skb_recv_datagram(), i.e.
skb->data is NULL, vmci_transport_dgram_dequeue() will return with 0
without updating msg_namelen leading to net/socket.c leaking the local,
uninitialized sockaddr_storage variable to userland -- 128 bytes of
kernel stack memory.

Fix this by moving the already existing msg_namelen assignment a few
lines above.

Cc: Andy King 
Cc: Dmitry Torokhov 
Cc: George Zhang 
Signed-off-by: Mathias Krause 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-04-03T05:31:54+00:00

Pull net into net-next to get the synchronize_net() bug fix in
bonding.

Signed-off-by: David S. Miller

VSOCK: Handle changes to the VMCI context ID.

2013-04-02T18:39:17+00:00

The VMCI context ID of a virtual machine may change at any time. There
is a VMCI event which signals this but datagrams may be processed before
this is handled. It is therefore necessary to be flexible about the
destination context ID of any datagrams received. (It can be assumed to
be correct because it is provided by the hypervisor.) The context ID on
existing sockets should be updated to reflect how the hypervisor is
currently referring to the system.

Signed-off-by: Reilly Grant 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Support VM sockets connected to the hypervisor.

2013-03-15T12:26:26+00:00

The resource ID used for VM socket control packets (0) is already
used for the VMCI_GET_CONTEXT_ID hypercall so a new ID (15) must be
used when the guest sends these datagrams to the hypervisor.

The hypervisor context ID must also be removed from the internal
blacklist.

Signed-off-by: Reilly Grant 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Don't reject PF_VSOCK protocol

2013-02-18T20:02:51+00:00

Allow our own family as the protocol value for socket creation.

Reported-by: Gerd Hoffmann 
Signed-off-by: Andy King 
Signed-off-by: David S. Miller