linux-stable.git/net/vmw_vsock, branch v3.13.2

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-21T02:52:30+00:00

This patch now always passes msg->msg_namelen as 0. recvmsg handlers must
set msg_namelen to the proper size <= sizeof(struct sockaddr_storage)
to return msg_name to the user.

This prevents numerous uninitialized memory leaks we had in the
recvmsg handlers and makes it harder for new code to accidentally leak
uninitialized memory.

Optimize for the case recvfrom is called with NULL as address. We don't
need to copy the address at all, so set it to NULL before invoking the
recvmsg handler. We can do so, because all the recvmsg handlers must
cope with the case a plain read() is called on them. read() also sets
msg_name to NULL.

Also document these changes in include/linux/net.h as suggested by David
Miller.

Changes since RFC:

Set msg->msg_name = NULL if user specified a NULL in msg_name but had a
non-null msg_namelen in verify_iovec/verify_compat_iovec. This doesn't
affect sendto as it would bail out earlier while trying to copy-in the
address. It also more naturally reflects the logic by the callers of
verify_iovec.

With this change in place I could remove "
if (!uaddr || msg_sys->msg_namelen == 0)
	msg->msg_name = NULL
".

This change does not alter the user visible error logic as we ignore
msg_namelen as long as msg_name is NULL.

Also remove two unnecessary curly brackets in ___sys_recvmsg and change
comments to netdev style.

Cc: David Miller 
Suggested-by: Eric Dumazet 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

treewide: Fix typo in Kconfig

2013-10-14T13:23:02+00:00

Correct spelling typo in Kconfig.

Signed-off-by: Masanari Iida 
Acked-by: Randy Dunlap 
Signed-off-by: Jiri Kosina

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

2013-08-16T22:37:26+00:00

net/vmw_vsock/af_vsock.c: drop unneeded semicolon

2013-08-05T18:07:44+00:00

Drop the semicolon at the end of the list_for_each_entry loop header.

Signed-off-by: Julia Lawall 
Signed-off-by: David S. Miller

VSOCK: Move af_vsock.h and vsock_addr.h to include/net

2013-07-28T05:14:06+00:00

This is useful for other VSOCK transport implemented outside the
net/vmw_vsock/ directory to use these headers.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Fix VSOCK_HASH and VSOCK_CONN_HASH

2013-06-24T06:51:48+00:00

If we mod with VSOCK_HASH_SIZE -1, we get 0, 1, .... 249.  Actually, we
have vsock_bind_table[0 ... 250] and vsock_connected_table[0 .. 250].
In this case the last entry will never be used.

We should mod with VSOCK_HASH_SIZE instead.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Remove unnecessary label

2013-06-24T06:51:48+00:00

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Return VMCI_ERROR_NO_MEM when fails to allocate skb

2013-06-24T06:51:48+00:00

vmci_transport_recv_dgram_cb always return VMCI_SUCESS even if we fail
to allocate skb, return VMCI_ERROR_NO_MEM instead.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

VSOCK: Introduce vsock_auto_bind helper

2013-06-24T06:51:48+00:00

This peace of code is called three times, let's have a helper for it.

Signed-off-by: Asias He 
Acked-by: Andy King 
Signed-off-by: David S. Miller

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