linux-stable.git/net/can, branch linux-2.6.33.y

can: add missing socket check in can/raw release

2011-05-09T23:04:47+00:00

commit 10022a6c66e199d8f61d9044543f38785713cbbd upstream.

v2: added space after 'if' according code style.

We can get here with a NULL socket argument passed from userspace,
so we need to handle it accordingly.

Thanks to Dave Jones pointing at this issue in net/can/bcm.c

Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller 
Cc: Chuck Ebbert 
Signed-off-by: Greg Kroah-Hartman

can: Add missing socket check in can/bcm release.

2011-05-09T23:04:45+00:00

commit c6914a6f261aca0c9f715f883a353ae7ff51fe83 upstream.

We can get here with a NULL socket argument passed from userspace,
so we need to handle it accordingly.

Signed-off-by: Dave Jones 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

CAN: Use inode instead of kernel address for /proc file

2011-04-14T23:53:14+00:00

commit 9f260e0efa4766e56d0ac14f1aeea6ee5eb8fe83 upstream.

Since the socket address is just being used as a unique identifier, its
inode number is an alternative that does not leak potentially sensitive
information.

CC-ing stable because MITRE has assigned CVE-2010-4565 to the issue.

Signed-off-by: Dan Rosenberg 
Acked-by: Oliver Hartkopp 
Signed-off-by: David S. Miller 
Cc: Moritz Muehlenhoff 
Signed-off-by: Greg Kroah-Hartman

can-bcm: fix minor heap overflow

2011-03-21T19:44:16+00:00

commit 0597d1b99fcfc2c0eada09a698f85ed413d4ba84 upstream.

On 64-bit platforms the ASCII representation of a pointer may be up to 17
bytes long. This patch increases the length of the buffer accordingly.

http://marc.info/?l=linux-netdev&m=128872251418192&w=2

Reported-by: Dan Rosenberg 
Signed-off-by: Oliver Hartkopp 
CC: Linus Torvalds 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net: Move && and || to end of previous line

2009-11-30T00:55:45+00:00

Not including net/atm/

Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.

Signed-off-by: Joe Perches 
Signed-off-by: David S. Miller

net: use net_eq to compare nets

2009-11-25T23:14:13+00:00

Generated with the following semantic patch

@@
struct net *n1;
struct net *n2;
@@
- n1 == n2
+ net_eq(n1, n2)

@@
struct net *n1;
struct net *n2;
@@
- n1 != n2
+ !net_eq(n1, n2)

applied over {include,net,drivers/net}.

Signed-off-by: Octavian Purdila 
Signed-off-by: David S. Miller

CAN: use dev_get_by_index_rcu

2009-11-11T06:27:13+00:00

Use new function to avoid doing read_lock().

Signed-off-by: Stephen Hemminger 
Acked-by: Eric Dumazet 
Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-09T07:00:54+00:00

Conflicts:
	drivers/net/can/usb/ems_usb.c

can: should not use __dev_get_by_index() without locks

2009-11-08T08:33:43+00:00

bcm_proc_getifname() is called with RTNL and dev_base_lock
not held. It calls __dev_get_by_index() without locks, and
this is illegal (might crash)

Close the race by holding dev_base_lock and copying dev->name
in the protected section.

Signed-off-by: Eric Dumazet 
Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

net: pass kern to net_proto_family create function

2009-11-06T06:18:14+00:00

The generic __sock_create function has a kern argument which allows the
security system to make decisions based on if a socket is being created by
the kernel or by userspace.  This patch passes that flag to the
net_proto_family specific create function, so it can do the same thing.

Signed-off-by: Eric Paris 
Acked-by: Arnaldo Carvalho de Melo 
Signed-off-by: David S. Miller