iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
Eugene Teo 5b33c4a272 net: clear heap allocation for ethtool_get_regs() 
commit b7c7d01aaed1f71d9afe815a569f0a81465a1744 upstream.

There is a conflict between commit b00916b1 and a77f5db3. This patch resolves
the conflict by clearing the heap allocation in ethtool_get_regs().

Signed-off-by: Eugene Teo <eugeneteo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-17 15:14:58 -08:00
..
9p
net/9p: Return error on read with NULL buffer
2010-10-28 09:08:49 -05:00
802
net/802: add __rcu annotations
2010-10-25 13:09:44 -07:00
8021q
vlan: rcu annotations
2010-10-25 13:09:43 -07:00
appletalk
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-11 14:53:53 -07:00
atm
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
ax25
net: ax25: fix information leak to userland harder
2011-02-17 15:14:37 -08:00
bluetooth
Bluetooth: Fix initial RFCOMM DLC security level
2010-12-06 15:47:44 -02:00
bridge
bridge: stp: ensure mac header is set
2011-01-03 12:09:33 -08:00
caif
caif: Remove noisy printout when disconnecting caif socket
2010-11-03 18:50:04 -07:00
can
CAN: Use inode instead of kernel address for /proc file
2010-12-31 11:13:27 -08:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2010-12-20 21:32:20 -08:00
core
net: clear heap allocation for ethtool_get_regs()
2011-02-17 15:14:58 -08:00
dcb
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
dccp
dccp: fix error in updating the GAR
2010-11-28 11:29:27 -08:00
decnet
DECnet: don't leak uninitialized stack byte
2010-11-28 11:32:30 -08:00
dns_resolver
DNS: If the DNS server returns an error, allow that to be cached [ver #2]
2010-08-11 17:11:28 +00:00
dsa
phylib: available for any speed ethernet
2010-08-11 23:03:50 -07:00
econet
econet: Fix crash in aun_incoming().
2010-12-08 20:51:15 -08:00
ethernet
net: return operator cleanup
2010-09-23 14:33:39 -07:00
ieee802154
ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc
2010-05-23 23:11:07 -07:00
ipv4
ipv4: IP defragmentation must be ECN aware
2011-02-17 15:14:23 -08:00
ipv6
inet6: prevent network storms caused by linux IPv6 routers
2011-02-17 15:14:23 -08:00
ipx
BKL: introduce CONFIG_BKL.
2010-10-21 15:44:13 +02:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-26 12:06:56 -08:00
iucv
[S390] cleanup lowcore access from external interrupts
2010-10-25 16:10:19 +02:00
key
net: return operator cleanup
2010-09-23 14:33:39 -07:00
l2tp
l2tp: Fix modalias of l2tp_ip
2010-12-08 12:13:43 -08:00
lapb
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
llc
llc: fix a device refcount imbalance
2010-12-08 09:58:44 -08:00
mac80211
mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit
2011-02-17 15:13:52 -08:00
netfilter
netfilter: fix IP_VS dependencies
2010-11-18 13:14:33 -08:00
netlabel
net: Remove unnecessary returns from void function()s
2010-05-17 23:23:14 -07:00
netlink
netlink: fix netlink_change_ngroups()
2010-10-24 16:25:39 -07:00
netrom
net: sk_sleep() helper
2010-04-20 16:37:13 -07:00
packet
net: Fix header size check for GSO case in recvmsg (af_packet)
2010-11-12 11:06:46 -08:00
phonet
phonet: remove the unused variable pn
2010-10-20 01:55:54 -07:00
rds
rds: Integer overflow in RDS cmsg handling
2010-11-17 12:20:52 -08:00
rfkill
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-10-23 11:47:02 -07:00
rose
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-09-27 01:03:03 -07:00
rxrpc
Add a dummy printk function for the maintenance of unused printks
2010-08-12 09:51:35 -07:00
sched
net_sched: pfifo_head_drop problem
2011-02-17 15:14:23 -08:00
sctp
sctp: fix the return value of getting the sctp partial delivery point
2010-12-16 14:48:44 -08:00
sunrpc
NFS: Don't use vm_map_ram() in readdir
2011-02-17 15:14:13 -08:00
tipc
net: tipc: fix information leak to userland
2010-11-09 09:25:46 -08:00
unix
af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
2011-02-17 15:14:22 -08:00
wanrouter
fix printk typo 'faild'
2010-08-09 11:25:17 +02:00
wimax
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-05-20 21:04:44 -07:00
wireless
cfg80211: fix disabling channels based on hints
2011-02-17 15:14:02 -08:00
x25
x25: decrement netdev reference counts on unload
2010-12-08 12:13:44 -08:00
xfrm
xfrm: Fix xfrm_state_migrate leak
2010-12-09 20:35:27 -08:00
compat.c
net: Limit socket I/O iovec total length to INT_MAX.
2010-10-28 11:47:52 -07:00
Kconfig
ceph: factor out libceph from Ceph file system
2010-10-20 15:37:28 -07:00
Makefile
ceph: factor out libceph from Ceph file system
2010-10-20 15:37:28 -07:00
nonet.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
socket.c
net: Document the kernel_recvmsg() function
2010-12-10 11:13:18 -08:00
sysctl_net.c
net: Remove unnecessary returns from void function()s
2010-05-17 23:23:14 -07:00
TUNABLE
…