黄涛 2caa51d22a Merge remote-tracking branch 'linux-2.6.32.y/master' into develop ...

Merge Linux 2.6.32.42
Conflicts:
	Makefile
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/p54/p54usb.c

2011-06-28 09:47:32 +08:00

..

9p

9p: strlen() doesn't count the terminator

2010-08-10 10:20:39 -07:00

802

…

8021q

vlan: Fix register_vlan_dev() error path

2009-11-17 06:45:04 -08:00

appletalk

…

atm

atm: expose ATM device index in sysfs

2011-06-23 15:24:04 -07:00

ax25

net: ax25: fix information leak to userland harder

2011-04-22 08:44:31 -07:00

bluetooth

Merge remote-tracking branch 'linux-2.6.32.y/master' into develop

2011-06-16 11:56:59 +08:00

bridge

bridge: netfilter: fix information leak

2011-04-14 16:53:32 -07:00

can

can: add missing socket check in can/raw release

2011-05-09 15:55:42 -07:00

core

gro: reset skb_iif on reuse

2011-04-14 16:53:41 -07:00

dcb

…

dccp

dccp: handle invalid feature options length

2011-05-23 11:20:15 -07:00

decnet

DECnet: don't leak uninitialized stack byte

2010-12-09 13:27:03 -08:00

dsa

…

econet

econet: fix CVE-2010-3848

2011-05-09 15:55:33 -07:00

ethernet

…

ieee802154

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

ipv4

Merge remote-tracking branch 'linux-2.6.32.y/master' into develop

2011-06-16 11:56:59 +08:00

ipv6

Merge remote-tracking branch 'linux-2.6.32.y/master' into develop

2011-06-28 09:47:32 +08:00

ipx

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

irda

irda: prevent integer underflow in IRLMP_ENUMDEVICES

2011-04-14 16:53:54 -07:00

iucv

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

key

…

lapb

…

llc

net/llc: make opt unsigned in llc_ui_setsockopt()

2010-09-26 17:21:24 -07:00

mac80211

mac80211: Add define for TX headroom reserved by mac80211 itself.

2011-05-09 15:55:22 -07:00

netfilter

netfilter: IPv6: fix DSCP mangle code

2011-06-23 15:24:09 -07:00

netlabel

…

netlink

netlink: fix compat recvmsg

2010-08-26 16:41:55 -07:00

netrom

ax25: netrom: rose: Fix timer oopses

2010-02-09 04:50:56 -08:00

packet

net: packet: fix information leak to userland

2011-04-14 16:53:46 -07:00

phonet

Phonet: device notifier only runs on initial namespace

2011-05-09 15:55:39 -07:00

rds

net: fix rds_iovec page count overflow

2011-04-22 08:44:32 -07:00

rfkill

rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down

2010-02-08 15:35:55 -08:00

rose

ROSE: prevent heap corruption with bad facilities

2011-04-14 16:53:27 -07:00

rxrpc

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

sched

sched: Fix softirq time accounting

2011-02-17 15:37:24 -08:00

sctp

sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set

2011-04-14 16:53:44 -07:00

sunrpc

SUNRPC: Deal with the lack of a SYN_SENT sk->sk_state_change callback...

2011-06-23 15:24:05 -07:00

tipc

net: tipc: fix information leak to userland

2011-04-14 16:53:50 -07:00

unix

af_unix: limit unix_tot_inflight

2011-05-09 15:55:36 -07:00

wanrouter

…

wimax

…

wireless

nl80211: fix check for valid SSID size in scan operations

2011-06-23 15:24:06 -07:00

x25

x25: Do not reference freed memory.

2011-03-02 09:47:07 -05:00

xfrm

…

compat.c

net: Limit socket I/O iovec total length to INT_MAX.

2010-12-09 13:27:13 -08:00

Kconfig

Paranoid network.

2010-02-08 15:07:32 -08:00

Makefile

…

nonet.c

…

socket.c

Merge remote branch 'linux-2.6.32.y/master' into develop

2010-12-16 20:54:24 +08:00

sysctl_net.c

…

TUNABLE

…