Tom Herbert
b0f77d0eae
net: fix problem in reading sock TX queue ...
Fix problem in reading the tx_queue recorded in a socket. In
dev_pick_tx, the TX queue is read by doing a check with
sk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.
The problem is that there is not mutual exclusion across these
calls in the socket so it it is possible that the queue in the
sock can be invalidated after sk_tx_queue_recorded is called so
that sk_tx_queue get returns -1, which sets 65535 in queue_index
and thus dev_pick_tx returns 65536 which is a bogus queue and
can cause crash in dev_queue_xmit.
We fix this by only calling sk_tx_queue_get which does the proper
checks. The interface is that sk_tx_queue_get returns the TX queue
if the sock argument is non-NULL and TX queue is recorded, else it
returns -1. sk_tx_queue_recorded is no longer used so it can be
completely removed.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-14 20:50:29 -07:00
9p: add 9P2000.L rename operation
2010-05-21 16:44:34 -05:00
Bluetooth: Create per controller workqueue
2010-05-10 09:34:03 +02:00
caif: Bugfix - use standard Linux lists
2010-05-23 23:57:41 -07:00
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
2010-02-15 15:38:10 +01:00
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
netfilter: nf_conntrack: fix a race in __nf_conntrack_confirm against nf_ct_get_next_corpse()
2010-05-20 15:55:30 +02:00
ipv6: ip6mr: support multiple tables
2010-05-11 14:40:55 +02:00
Phonet: zero-copy GPRS TX
2010-01-07 00:24:55 -08:00
sctp: dubious bitfields in sctp_transport
2010-05-26 00:40:11 -07:00
pkt_sched: skbedit add support for setting mark
2009-10-22 21:56:42 -07:00
tipc: Update commenting in TIPC API
2010-05-12 23:02:23 -07:00
net: restore gnet_stats_basic to previous definition
2009-08-17 21:33:49 -07:00
net: Add checking to rcu_dereference() primitives
2010-02-25 09:41:03 +01:00
af_ieee802154: add support for WANT_ACK socket option
2009-08-12 21:54:50 -07:00
net: sock_def_readable() and friends RCU conversion
2010-05-01 15:00:15 -07:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
net: make neigh_ops constant
2009-09-01 17:40:57 -07:00
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
cfg80211/mac80211: better channel handling
2010-05-07 14:55:50 -04:00
cls_cgroup: Initialise classid when module is absent
2010-05-25 18:53:57 -07:00
net: fix compat_sys_recvmmsg parameter type
2009-12-11 15:07:56 -08:00
dcbnl: Add support for setapp/getapp to netdev dcbnl_rtnl_ops
2009-09-01 01:24:30 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-12-08 07:55:01 -08:00
decnet: Remove unused FIB metric macros.
2010-03-27 19:23:46 -07:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
net: check for refcount if pop a stacked dst_entry
2010-06-04 15:56:00 -07:00
netns: embed ip6_dst_ops directly
2009-09-01 17:40:31 -07:00
net: fib_rules: mark arguments to fib_rules_register const and __net_initdata
2010-04-26 16:02:04 +02:00
flow: virtualize flow cache entry methods
2010-04-07 03:43:18 -07:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h
2010-04-13 14:49:31 -07:00
wireless: update radiotap parser
2010-02-08 16:50:53 -05:00
ieee802154: move headers out of extra directory
2009-07-23 17:08:51 +04:00
ieee802154: add an mlme_ops call to retrieve PHY object
2009-11-06 14:32:18 +03:00
ipv6: Replace inet6_ifaddr->dead with state
2010-05-18 15:36:06 -07:00
net: replace ipfragok with skb->local_df
2010-04-15 23:36:37 -07:00
tcp: Fix a connect() race with timewait sockets
2009-12-08 20:17:51 -08:00
net: replace ipfragok with skb->local_df
2010-04-15 23:36:37 -07:00
tcp: Fix a connect() race with timewait sockets
2009-12-08 20:17:51 -08:00
net: Make RFS socket operations not be inet specific.
2010-04-27 15:11:48 -07:00
net: suppress RCU lockdep false positive in twsk_net()
2010-04-27 12:39:01 -07:00
inetpeer: Optimize inet_getid()
2009-11-13 20:46:58 -08:00
kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
2010-05-25 08:07:02 -07:00
ipv6 fib: Make rt6_info{} more cache-line aware.
2010-04-01 18:41:41 -07:00
net: sk_dst_cache RCUification
2010-04-13 01:41:33 -07:00
ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
2010-03-10 07:32:29 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-11-06 00:55:55 -08:00
ipvs: SCTP Trasport Loadbalancing Support
2010-02-18 12:31:05 +01:00
percpu: add __percpu sparse annotations to net
2010-02-16 23:05:38 -08:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
2010-05-25 08:07:02 -07:00
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
include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment
2010-03-31 14:49:12 -04:00
llc: convert llc_sap_list to RCU
2009-12-26 20:46:28 -08:00
llc: use a device based hash table to speed up multicast delivery
2009-12-26 20:43:57 -08:00
wireless: fix mac80211.h kernel-doc warnings
2010-05-24 15:07:42 -04:00
ipv6 mcast: Introduce include/net/mld.h for MLD definitions.
2010-04-23 13:35:55 +09:00
sysctl: remove "struct file *" argument of ->proc_handler
2009-09-24 07:21:04 -07:00
netfilter: bridge-netfilter: Fix MAC header handling with IP DNAT
2010-04-15 12:26:39 +02:00
nsproxy: remove INIT_NSPROXY()
2010-03-12 15:52:40 -08:00
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
netlink: fix unaligned access in nla_get_be64()
2010-03-19 22:47:23 -07:00
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
ieee802154: add support for channel pages from IEEE 802.15.4-2006
2009-08-19 23:08:22 +04:00
net: rename skb->iif to skb->skb_iif
2009-11-20 15:35:04 -08:00
gen_estimator: deadlock fix
2010-04-01 18:38:48 -07:00
net: drop capability from protocol definitions
2009-11-05 21:40:17 -08:00
ipv4: ipmr: support multiple tables
2010-04-13 14:49:34 -07:00
ipv6: Use correct data types for ICMPv6 type and code
2009-06-23 04:31:07 -07:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
cfg80211: add regulatory hint disconnect support
2010-02-01 15:40:06 -05:00
tcp: account SYN-ACK timeouts & retransmissions
2010-01-17 19:09:39 -08:00
NET: ROSE: Don't use static buffer.
2009-07-26 19:11:14 -07:00
net: implements ip_route_input_noref()
2010-05-17 17:18:51 -07:00
rtnetlink: support specifying device flags on device creation
2010-02-27 02:43:40 -08:00
net: decreasing real_num_tx_queues needs to flush qdisc
2010-07-02 21:59:07 -07:00
net: cleanup include/net
2009-11-04 05:06:25 -08:00
snmp: fix SNMP_ADD_STATS()
2010-06-23 11:48:19 -07:00
net: fix problem in reading sock TX queue
2010-07-14 20:50:29 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-05-16 22:26:58 -07:00
IPv6: Add dontfrag argument to relevant functions
2010-04-23 23:35:28 -07:00
udp: bind() optimisation
2009-11-10 20:54:38 -08:00
wext: refactor
2009-10-07 16:39:43 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
ieee802154: add support for creation/removal of logic interfaces
2009-11-06 14:32:24 +03:00
X25: Move accept approve flag to bitfield
2010-05-17 17:39:27 -07:00
X25: Add if_x25.h and x25 to device identifiers
2010-04-22 16:12:36 -07:00
xfrm: fix XFRMA_MARK extraction in xfrm_mark_get
2010-06-30 10:43:31 -07:00
b0f77d0eae