The new 3.6.11.x short-term extended stable series (stable review)
Subsystems (32)
cover The new 3.6.11.x short-term extended stable series (stable review)
Currently, the latest stable PREEMPT_RT patch is based off of 3.6.11. As 3.6 is no longer supported by the stable Linux maintainers, this release has been neglected, and its unfortunate that its the latest of the -rt stable series.
I have decided to create a stable series that extends 3.6.11, and will be of the form 3.6.11.x. I want to stress that this is a temporary series, and will not be for long term. I will be pulling in patches from 3.4 and 3.8 stable releases as I find time.
I will host the 3.6.11.x patches at:
https://www.kernel.org/pub/linux/kernel/projects/rt/3.6/stable/
Nothing is there yet.
Below is the format of the announcements I will make for the 3.6.11.x stable reviews. This being the first of the series.
Again, I want to stress that this is not a long term stable release. I will only support 3.6.11.x until 3.8-rt becomes stable. At which time I will drop support for both 3.6.11.x as well as 3.6-rt.
-- Steve
This is the start of the stable review cycle for 3.6.11.1 release. There are 86 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri Mar 29 2013. Anything received after that time might be too late.
Akinobu Mita (1):
batman-adv: fix random jitter calculation
[143cdd8f33909ff5a153e3f02048738c5964ba26]
Alexander Aring (1):
mac802154: fix NOHZ local_softirq_pending 08 warning
[386de15c3f62bf100b4e162c0a859785d2d58661]
Christoph Paasch (1):
inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock
[e337e24d6624e74a558aa69071e112a65f7b5758]
Cong Wang (4):
rds: limit the size allocated by rds_message_alloc()
[ece6b0a2b25652d684a7ced4ae680a863af041e0]
vlan: adjust vlan_set_encap_proto() for its callers
[da8c87241c26aac81a64c7e4d21d438a33018f4e]
pktgen: correctly handle failures when adding a device
[604dfd6efc9b79bce432f2394791708d8e8f6efc]
net: prevent setting ttl=0 via IP_TTL
[c9be4a5c49cf51cc70a993f004c5bb30067a65ce]
Cristian Bercaru (1):
bridging: fix rx_handlers return code
[3bc1b1add7a8484cc4a261c3e128dbe1528ce01f]
Daniel Borkmann (3):
sctp: jsctp_sf_eat_sack: fix jprobes function signature mismatch
[c5b1825fa547eb475ca8936f6f346c18b1ece298]
net: sctp: sctp_endpoint_free: zero out secret key data
[b5c37fe6e24eec194bb29d22fdd55d73bcc709bf]
net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
[6ba542a291a5e558603ac51cda9bded347ce7627]
Dave Kleikamp (1):
sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
[6cb9c3697585c47977c42c5cc1b9fc49247ac530]
David S. Miller (4):
sparc64: Fix gfp_flags setting in tsb_grow().
[95a2fea6fbb81f56e2ecb60ef0c31e075d6a8995]
sparc64: Add missing HAVE_ARCH_TRANSPARENT_HUGEPAGE.
[f53f5f1e2a84c2a95c47f28b0859ef5eee34569d]
sunvdc: Fix off-by-one in generic_request().
[f4d9605434c0fd4cc8639bf25cfc043418c52362]
via-rhine: Fix bugs in NAPI support.
[559bcac35facfed49ab4f408e162971612dcfdf3]
David Vrabel (2):
xen-netback: cancel the credit timer when taking the vif down
[3e55f8b306cf305832a4ac78aa82e1b40e818ece]
xen-netback: correctly return errors from netbk_count_requests()
[35876b5ffc154c357476b2c3bdab10feaf4bd8f0]
Duan Jiong (1):
ipv6: Change skb->data before using icmpv6_notify() to propagate redirect
[7801a085efab5f1d7cc54fa1f80b0c69b457db68]Eric Dumazet (17):
ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
[0b652fb68c02c1acd0307d3acac4ae7123536031]
net: splice: fix __splice_segment()
[9049d7450887d54b199441144f8ba50fa4d8cf92]
net: splice: avoid high order page splitting
[4678414601960b3d60b651d82e2913c48c53508d]
tcp: fix splice() and tcp collapsing interaction
[fdd384558afc89793bf35db6b5263e80ee92093d]
tcp: splice: fix an infinite loop in tcp_read_sock()
[74b2a7b4ea60d5c1c94ac01ad001e16ac40132f3]
tcp: fix an infinite loop in tcp_slow_start()
[93e3a886683c28e718e146c827e9cc750c88817e]
tcp: fix incorrect LOCKDROPPEDICMPS counter
[55ef74760190fb39eacaaee1816dfaeeadd5b92d]
macvlan: fix macvlan_get_size()
[ee19a438d8f4f7ff5a9469a2f30bba7bb15f00ec]
tun: add a missing nf_reset() in tun_net_xmit()
[f8af75f3517a24838a36eb5797a1a3e60bf9e276]
ipv6: use a stronger hash for tcp
[08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664]
net: fix infinite loop in __skb_recv_datagram()
[77c1090f94d1b0b5186fb13a1b71b47b1343f87f]
tcp: frto should not set snd_cwnd to 0
[2e5f421211ff76c17130b4597bc06df4eeead24f]
net: loopback: fix a dst refcounting issue
[794ed393b707f01858f5ebe2ae5eabaf89d00022]
netxen: fix off by one bug in netxen_release_tx_buffer()
[a05948f296ce103989b28a2606e47d2e287c3c89]
tcp: RFC 5961 5.2 Blind Data Injection Attack Mitigation
[354e4aa391ed50a4d827ff6fc11e0667d0859b25]
tcp: tcp_replace_ts_recent() should not be called from tcp_validate_incoming()
[bd090dfc634ddd711a5fbd0cadc6e0ab4977bcaf]
tcp: fix MSG_SENDPAGE_NOTLAST logic
[ae62ca7b03217be5e74759dc6d7698c95df498b3]
Guillaume Nault (1):
l2tp: Restore socket refcount when sendmsg succeeds
[8b82547e33e85fc24d4d172a93c796de1fefa81a]
Hannes Frederic Sowa (1):
ipv6: stop multicast forwarding to process interface scoped addresses
[ddf64354af4a702ee0b85d0a285ba74c7278a460]
Heiko Carstens (1):
atm/iphase: rename fregt_t -> ffreg_t
[ab54ee80aa7585f9666ff4dd665441d7ce41f1e8]Ian Campbell (3):
netback: correct netbk_tx_err to handle wrap around.
[b9149729ebdcfce63f853aa54a404c6a8f6ebbf3]
xen/netback: free already allocated memory on failure in xen_netbk_get_requests
[4cc7c1cb7b11b6f3515bd9075527576a1eecc4aa]
xen/netback: shutdown the ring if it contains garbage.
[48856286b64e4b66ec62b94e504d0b29c1ade664]
Ilpo Järvinen (1):
tcp: fix for zero packets_in_flight was too broad
[6731d2095bd4aef18027c72ef845ab1087c3ba63]
Kleber Sacilotto de Souza (1):
mlx4_en: fix allocation of CPU affinity reverse-map
[77c5d9e186705280ca6eff08f3280a5f70c79f8e]
Li Wei (2):
ipv4: fix error handling in icmp_protocol.
[a426b816575c9701ddcb12a793693dbcbcee5c2b]
ipv4: fix a bug in ping_err().
[b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8]
Lorenzo Colitti (1):
net: ipv6: Don't purge default router if accept_ra=2
[3e8b0ac3e41e3c882222a5522d5df7212438ab51]
Marcelo Ricardo Leitner (1):
ipv6: do not create neighbor entries for local delivery
[bd30e947207e2ea0ff2c08f5b4a03025ddce48d3]
Mathias Krause (3):
dcbnl: fix various netlink info leaks
[29cd8ae0e1a39e239a3a7b67da1986add1199fc0]
rtnl: fix info leak on RTM_GETLINK request for VF devices
[84d73cd3fb142bf1298a8c13fd4ca50fd2432372]
sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
[6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0]Matthew Daley (1):
xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.
[7d5145d8eb2b9791533ffe4dc003b129b9696c48]
Neal Cardwell (1):
tcp: fix double-counted receiver RTT when leaving receiver fast path
[aab2b4bf224ef8358d262f95b568b8ad0cecf0a0]
Neil Horman (1):
sctp: refactor sctp_outq_teardown to insure proper re-initalization
[2f94aabd9f6c925d77aecb3ff020f1cc12ed8f86]
Nithin Nayak Sujir (2):
tg3: Fix crc errors on jumbo frame receive
[daf3ec688e057f6060fb9bb0819feac7a8bbf45c]
tg3: Avoid null pointer dereference in tg3_interrupt in netconsole mode
[9c13cb8bb477a83b9a3c9e5a5478a4e21294a760]
Or Gerlitz (1):
net/mlx4_core: Set number of msix vectors under SRIOV mode to firmware defaults
[ca4c7b35f75492de7fbf5ee95be07481c348caee]
Paul Moore (2):
netlabel: correctly list all the static label mappings
[0c1233aba1e948c37f6dc7620cb7c253fcd71ce9]
netlabel: fix build problems when CONFIG_IPV6=n
[a6a8fe950e1b8596bb06f2c89c3a1a4bf2011ba9]
Phil Sutter (1):
packet: fix leakage of tx_ring memory
[9665d5d62487e8e7b1f546c00e11107155384b9a]
Pravin B Shelar (1):
IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
[d0a7cc630a337b0f56dc145e7eb6232852b14dd4]
Rob Herring (1):
net: calxedaxgmac: throw away overrun frames
[d6fb3be544b46a7611a3373fcaa62b5b0be01888]
Romain KUNTZ (2):
xfrm: release neighbor upon dst destruction
[2894f6da7e382a42948cc42ab52148dddf281c48]
ipv6: fix header length calculation in ip6_append_data()
[7efdba5bd9a2f3e2059beeb45c9fa55eefe1bced]
Romain Kuntz (1):
ipv6: fix the noflags test in addrconf_get_prefix_route
[85da53bf1c336bb07ac038fb951403ab0478d2c5]
Sarveshwar Bandi (1):
bridge: Pull ip header into skb->data before looking into ip header.
[6caab7b0544e83e6c160b5e80f5a4a7dd69545c7]Stefan Hasko (1):
net: sched: integer overflow fix
[d2fe85da52e89b8012ffad010ef352a964725d5f]
Steffen Klassert (6):
ipv4: Fix route refcount on pmtu discovery
[9a2a0fefaf476a4be4d153792eaa600203b83edf]
ipv4: Add a socket release callback for datagram sockets
[1c4fa590068ef4e257cb7b27643a3ee34cf9163b]
ipv4: Invalidate the socket cached route on pmtu events if possible
[c82d543a2e8727233337c6f93ba7a1bddd5228cc]
ipv6: Add an error handler for icmp6
[cdd6baf1fd9159d9b333938f1717e7c4cba025cc]
ipv4: Don't update the pmtu on mtu locked routes
[4ac7bed1ff5f935525a8c71c347bbc8cdff9e067]
ipv4: Remove output route check in ipv4_mtu
[34f48df8ec531943ca83ea994eb2561897d8f9f4]
Stephen Hemminger (2):
bridge: set priority of STP packets
[547b4e718115eea74087e28d7fa70aec619200db]
MAINTAINERS: Stephen Hemminger email change
[adbbf69d1a54abf424e91875746a610dcc80017d]
Tilman Schmidt (1):
isdn/gigaset: fix zero size border case in debug dump
[d721a1752ba544df8d7d36959038b26bc92bdf80]
Timo Teräs (1):
r8169: remove the obsolete and incorrect AMD workaround
[5d0feaff230c0abfe4a112e6f09f096ed99e0b2d]
Vlad Yasevich (2):
team: unsyc the devices addresses when port is removed
[972ea34911d5f81639d963224d00add37170bd52]
macvlan: Set IFF_UNICAST_FLT flag to prevent unnecessary promisc mode.
[87ab7f6f2874f1115817e394a7ed2dea1c72549e]
Willy Tarreau (1):
tcp: don't abort splice() after small transfers
[e9feca83d1496afabd0cc174863646e6d7101d85]
YOSHIFUJI Hideaki / 吉藤英明 (2):
ipv6: fix race condition regarding dst->expires and dst->from.
[eaf11ca939f83c273740d5bcec7225969ae95295]
6lowpan: Fix endianness issue in is_addr_link_local().
[9026c4927254f5bea695cc3ef2e255280e6a3011]Yan Burman (1):
net/mlx4_en: Fix bridged vSwitch configuration for non SRIOV mode
[213815a1e6ae70b9648483b110bc5081795f99e8]
Ying Xue (1):
net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
[dec34fb0f5b7873de45132a84a3af29e61084a6b]
Yuchung Cheng (2):
tcp: fix SYN-data space mis-accounting
[f7983d26995f85994a08ee173ee7d0c4ff3da356]
tcp: detect SYN/data drop when F-RTO is disabled
[9d475971466bf0e4c65a88d46031b8127a767897]
----
MAINTAINERS | 6 +- arch/sparc/Kconfig | 1 + arch/sparc/include/asm/hugetlb.h | 10 +- arch/sparc/mm/tsb.c | 2 +- drivers/atm/iphase.h | 146 ++++++++++---------- drivers/block/sunvdc.c | 2 +- drivers/isdn/gigaset/capi.c | 2 + drivers/net/ethernet/broadcom/tg3.c | 62 ++++++--- drivers/net/ethernet/calxeda/xgmac.c | 4 + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 +- drivers/net/ethernet/mellanox/mlx4/main.c | 11 +- .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 + drivers/net/ethernet/realtek/r8169.c | 7 - drivers/net/ethernet/via/via-rhine.c | 8 +- drivers/net/loopback.c | 5 + drivers/net/macvlan.c | 6 +- drivers/net/ppp/ppp_generic.c | 8 ++ drivers/net/team/team.c | 2 + drivers/net/tun.c | 2 + drivers/net/xen-netback/common.h | 3 + drivers/net/xen-netback/interface.c | 26 ++-- drivers/net/xen-netback/netback.c | 123 ++++++++++------- fs/splice.c | 4 +- include/linux/if_vlan.h | 6 +- include/net/dst.h | 8 +- include/net/icmp.h | 1 + include/net/inet6_hashtables.h | 8 +- include/net/inet_connection_sock.h | 1 + include/net/inet_sock.h | 1 + include/net/ip.h | 2 + include/net/ip6_fib.h | 39 ++---- include/net/ipv6.h | 12 ++ include/net/ndisc.h | 7 + include/net/sock.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/bridge/br_netfilter.c | 3 + net/bridge/br_stp_bpdu.c | 2 + net/core/datagram.c | 2 +- net/core/dev.c | 1 + net/core/dst.c | 1 + net/core/pktgen.c | 9 +- net/core/rtnetlink.c | 1 + net/core/skbuff.c | 44 ++---- net/core/sock_diag.c | 3 + net/dcb/dcbnl.c | 8 ++ net/dccp/ipv4.c | 4 +- net/dccp/ipv6.c | 3 +- net/ieee802154/6lowpan.h | 2 +- net/ipv4/af_inet.c | 11 +- net/ipv4/datagram.c | 25 ++++ net/ipv4/icmp.c | 23 +++ net/ipv4/inet_connection_sock.c | 16 +++ net/ipv4/ip_gre.c | 6 +- net/ipv4/ip_sockglue.c | 2 +- net/ipv4/ping.c | 5 +- net/ipv4/raw.c | 1 + net/ipv4/route.c | 54 +++++++- net/ipv4/tcp.c | 27 ++-- net/ipv4/tcp_cong.c | 14 +- net/ipv4/tcp_input.c | 72 ++++++---- net/ipv4/tcp_ipv4.c | 15 +- net/ipv4/tcp_output.c | 18 ++- net/ipv4/udp.c | 1 + net/ipv6/addrconf.c | 2 +- net/ipv6/icmp.c | 12 ++ net/ipv6/ip6_input.c | 3 +- net/ipv6/ip6_output.c | 4 +- net/ipv6/ndisc.c | 17 +++ net/ipv6/route.c | 13 +- net/ipv6/tcp_ipv6.c | 3 +- net/ipv6/xfrm6_policy.c | 2 + net/l2tp/l2tp_ppp.c | 1 + net/mac802154/wpan.c | 2 +- net/netlabel/netlabel_unlabeled.c | 27 ++-- net/packet/af_packet.c | 10 +- net/rds/message.c | 3 + net/sched/sch_htb.c | 2 +- net/sctp/endpointola.c | 5 + net/sctp/outqueue.c | 12 +- net/sctp/probe.c | 3 +- net/sctp/socket.c | 2 +- 83 files changed, 666 insertions(+), 378 deletions(-)
PATCH 1/86 sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Dave Kleikamp <[email protected]>
[ Upstream commit 6cb9c3697585c47977c42c5cc1b9fc49247ac530 ]
Modifying the huge pte's requires that all the underlying pte's be modified.
Version 2: added missing flush_tlb_page()
--- arch/sparc/include/asm/hugetlb.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/sparc/include/asm/hugetlb.h +8 -2
@@ -58,14 +58,20 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)static inline void huge_ptep_set_wrprotect (struct mm_struct *mm,unsigned long addr,pte_t *ptep) { -ptep_set_wrprotect (mm, addr, ptep); +pte_t old_pte = *ptep; +set_huge_pte_at (mm, addr, ptep,pte_wrprotect (old_pte)); }static inline int huge_ptep_set_access_flags (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep,pte_t pte,int dirty) { -return ptep_set_access_flags (vma, addr, ptep, pte, dirty); +int changed = !pte_same (*ptep, pte); +if (changed) { +set_huge_pte_at (vma->vm_mm, addr, ptep, pte); +flush_tlb_page (vma, addr); + } +return changed; }static inline pte_t huge_ptep_get (pte_t *ptep)
Signature · 1 line
1.7.10.4
PATCH 2/86 batman-adv: fix random jitter calculation
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Akinobu Mita <[email protected]>
[ Upstream commit 143cdd8f33909ff5a153e3f02048738c5964ba26 ]
batadv_iv_ogm_emit_send_time() attempts to calculates a random integer in the range of 'orig_interval +- BATADV_JITTER' by the below lines.
msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
msecs += (random32() % 2 * BATADV_JITTER);But it actually gets 'orig_interval' or 'orig_interval - BATADV_JITTER' because '%' and '*' have same precedence and associativity is left-to-right.
This adds the parentheses at the appropriate position so that it matches original intension.
--- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bat_iv_ogm.c +1 -1
@@ -119,7 +119,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)unsigned int msecs; msecs =atomic_read (&bat_priv->orig_interval) -BATADV_JITTER ; - msecs += (random32 () %2 *BATADV_JITTER ); + msecs +=random32 () % (2 *BATADV_JITTER );return jiffies +msecs_to_jiffies (msecs); }
Signature · 1 line
1.7.10.4
PATCH 3/86 inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Christoph Paasch <[email protected]>
[ Upstream commit e337e24d6624e74a558aa69071e112a65f7b5758 ]
If in either of the above functions inet_csk_route_child_sock() or __inet_inherit_port() fails, the newsk will not be freed:
unreferenced object 0xffff88022e8a92c0 (size 1592):
comm "softirq", pid 0, jiffies 4294946244 (age 726.160s) hex dump (first 32 bytes):
0a 01 01 01 0a 01 01 02 00 00 00 00 a7 cc 16 00 ................
02 00 03 01 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8153d190>] kmemleak_alloc+0x21/0x3e
[<ffffffff810ab3e7>] kmem_cache_alloc+0xb5/0xc5
[<ffffffff8149b65b>] sk_prot_alloc.isra.53+0x2b/0xcd
[<ffffffff8149b784>] sk_clone_lock+0x16/0x21e
[<ffffffff814d711a>] inet_csk_clone_lock+0x10/0x7b
[<ffffffff814ebbc3>] tcp_create_openreq_child+0x21/0x481
[<ffffffff814e8fa5>] tcp_v4_syn_recv_sock+0x3a/0x23b
[<ffffffff814ec5ba>] tcp_check_req+0x29f/0x416
[<ffffffff814e8e10>] tcp_v4_do_rcv+0x161/0x2bc
[<ffffffff814eb917>] tcp_v4_rcv+0x6c9/0x701
[<ffffffff814cea9f>] ip_local_deliver_finish+0x70/0xc4
[<ffffffff814cec20>] ip_local_deliver+0x4e/0x7f
[<ffffffff814ce9f8>] ip_rcv_finish+0x1fc/0x233
[<ffffffff814cee68>] ip_rcv+0x217/0x267
[<ffffffff814a7bbe>] __netif_receive_skb+0x49e/0x553
[<ffffffff814a7cc3>] netif_receive_skb+0x50/0x82This happens, because sk_clone_lock initializes sk_refcnt to 2, and thus a single sock_put() is not enough to free the memory. Additionally, things like xfrm, memcg, cookie_values,... may have been initialized. We have to free them properly.
This is fixed by forcing a call to tcp_done(), ending up in inet_csk_destroy_sock, doing the final sock_put(). tcp_done() is necessary, because it ends up doing all the cleanup on xfrm, memcg, cookie_values, xfrm,...
Before calling tcp_done, we have to set the socket to SOCK_DEAD, to force it entering inet_csk_destroy_sock. To avoid the warning in inet_csk_destroy_sock, inet_num has to be set to 0.
As inet_csk_destroy_sock does a dec on orphan_count, we first have to increase it.
Calling tcp_done() allows us to remove the calls to tcp_clear_xmit_timer() and tcp_cleanup_congestion_control().
A similar approach is taken for dccp by calling dccp_done().
This is in the kernel since 093d282321 (tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()), thus since version >= 2.6.37.
--- include/net/inet_connection_sock.h | 1 + net/dccp/ipv4.c | 4 ++-- net/dccp/ipv6.c | 3 ++- net/ipv4/inet_connection_sock.c | 16 ++++++++++++++++ net/ipv4/tcp_ipv4.c | 6 ++---- net/ipv6/tcp_ipv6.c | 3 ++- 6 files changed, 25 insertions(+), 8 deletions(-)
include/net/inet_connection_sock.h +1 -0
@@ -318,6 +318,7 @@ extern void inet_csk_reqsk_queue_prune(struct sock *parent, const unsigned long max_rto);extern void inet_csk_destroy_sock (struct sock *sk); +extern void inet_csk_prepare_forced_close (struct sock *sk);/* * LISTEN is a special case for poll..
net/dccp/ipv4.c +2 -2
@@ -439,8 +439,8 @@ exit:NET_INC_STATS_BH (sock_net (sk),LINUX_MIB_LISTENDROPS );return NULL ; put_and_exit: -bh_unlock_sock (newsk); -sock_put (newsk); +inet_csk_prepare_forced_close (newsk); +dccp_done (newsk); goto exit; }
net/dccp/ipv6.c +2 -1
@@ -585,7 +585,8 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, newinet->inet_rcv_saddr =LOOPBACK4_IPV6 ;if (__inet_inherit_port (sk, newsk) <0 ) { -sock_put (newsk); +inet_csk_prepare_forced_close (newsk); +dccp_done (newsk); goto out; }__inet6_hash (newsk,NULL );
net/ipv4/inet_connection_sock.c +16 -0
@@ -679,6 +679,22 @@ void inet_csk_destroy_sock(struct sock *sk) }EXPORT_SYMBOL (inet_csk_destroy_sock); +/* This function allows to force a closure of a socket after the call to +* tcp/dccp_create_openreq_child(). +*/ +void inet_csk_prepare_forced_close (struct sock *sk) +{ +/* sk_clone_lock locked the socket and set refcnt to 2 */ +bh_unlock_sock (sk); +sock_put (sk); + +/* The below has to be done to allow calling inet_csk_destroy_sock */ +sock_set_flag (sk,SOCK_DEAD ); +percpu_counter_inc (sk->sk_prot->orphan_count); +inet_sk (sk)->inet_num =0 ; +} +EXPORT_SYMBOL (inet_csk_prepare_forced_close); +int inet_csk_listen_start (struct sock *sk,const int nr_table_entries) {struct inet_sock *inet =inet_sk (sk);
net/ipv4/tcp_ipv4.c +2 -4
@@ -1537,10 +1537,8 @@ exit:NET_INC_STATS_BH (sock_net (sk),LINUX_MIB_LISTENDROPS );return NULL ; put_and_exit: -tcp_clear_xmit_timers (newsk); -tcp_cleanup_congestion_control (newsk); -bh_unlock_sock (newsk); -sock_put (newsk); +inet_csk_prepare_forced_close (newsk); +tcp_done (newsk); goto exit; }EXPORT_SYMBOL (tcp_v4_syn_recv_sock);
net/ipv6/tcp_ipv6.c +2 -1
@@ -1371,7 +1371,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,#endif if (__inet_inherit_port (sk, newsk) <0 ) { -sock_put (newsk); +inet_csk_prepare_forced_close (newsk); +tcp_done (newsk); goto out; }__inet6_hash (newsk,NULL );
Signature · 1 line
1.7.10.4
PATCH 4/86 net: sched: integer overflow fix
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Stefan Hasko <[email protected]>
[ Upstream commit d2fe85da52e89b8012ffad010ef352a964725d5f ]
Fixed integer overflow in function htb_dequeue
--- net/sched/sch_htb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_htb.c +1 -1
@@ -874,7 +874,7 @@ ok: q->now =psched_get_time (); start_at = jiffies; - next_event = q->now +5 *PSCHED_TICKS_PER_SEC ; + next_event = q->now +5LLU *PSCHED_TICKS_PER_SEC ;for (level =0 ; level <TC_HTB_MAXDEPTH ; level++) {/* common case optimization - skip event handler quickly */
Signature · 1 line
1.7.10.4
PATCH 5/86 tcp: fix MSG_SENDPAGE_NOTLAST logic
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ae62ca7b03217be5e74759dc6d7698c95df498b3 ]
commit 35f9c09fe9c72e (tcp: tcp_sendpages() should call tcp_push() once) added an internal flag : MSG_SENDPAGE_NOTLAST meant to be set on all frags but the last one for a splice() call.
The condition used to set the flag in pipe_to_sendpage() relied on splice() user passing the exact number of bytes present in the pipe, or a smaller one.
But some programs pass an arbitrary high value, and the test fails.
The effect of this bug is a lack of tcp_push() at the end of a splice(pipe -> socket) call, and possibly very slow or erratic TCP sessions.
We should both test sd->total_len and fact that another fragment is in the pipe (pipe->nrbufs > 1)
Many thanks to Willy for providing very clear bug report, bisection and test programs.
--- fs/splice.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/splice.c +3 -1
@@ -696,8 +696,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,return -EINVAL ; more = (sd->flags &SPLICE_F_MORE ) ?MSG_MORE :0 ; -if (sd->len < sd->total_len) + +if (sd->len < sd->total_len && pipe->nrbufs >1 ) more |=MSG_SENDPAGE_NOTLAST ; +return file->f_op->sendpage (file, buf->page, buf->offset, sd->len, &pos, more); }
Signature · 1 line
1.7.10.4
PATCH 6/86 tcp: tcp_replace_ts_recent() should not be called from tcp_validate_incoming()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit bd090dfc634ddd711a5fbd0cadc6e0ab4977bcaf ]
We added support for RFC 5961 in latest kernels but TCP fails to perform exhaustive check of ACK sequence.
We can update our view of peer tsval from a frame that is later discarded by tcp_ack()
This makes timestamps enabled sessions vulnerable to injection of a high tsval : peers start an ACK storm, since the victim sends a dupack each time it receives an ACK from the other peer.
As tcp_validate_incoming() is called before tcp_ack(), we should not peform tcp_replace_ts_recent() from it, and let callers do it at the right time.
--- net/ipv4/tcp_input.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
net/ipv4/tcp_input.c +10 -5
@@ -5340,11 +5340,6 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, goto discard; } -/* ts_recent update must be made after we are sure that the packet -* is in window. -*/ -tcp_replace_ts_recent (tp,TCP_SKB_CB (skb)->seq); -/* step 3: check security and precedence [ignored] */ /* step 4: Check for a SYN
@@ -5579,6 +5574,11 @@ step5:if (th->ack &&tcp_ack (sk, skb,FLAG_SLOWPATH ) <0 ) goto discard; +/* ts_recent update must be made after we are sure that the packet +* is in window. +*/ +tcp_replace_ts_recent (tp,TCP_SKB_CB (skb)->seq); +tcp_rcv_rtt_measure_ts (sk, skb);/* Process urgent data. */
@@ -6106,6 +6106,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, }else goto discard; +/* ts_recent update must be made after we are sure that the packet +* is in window. +*/ +tcp_replace_ts_recent (tp,TCP_SKB_CB (skb)->seq); +/* step 6: check the URG bit */ tcp_urg (sk, skb, th);
Signature · 1 line
1.7.10.4
PATCH 7/86 tcp: RFC 5961 5.2 Blind Data Injection Attack Mitigation
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 354e4aa391ed50a4d827ff6fc11e0667d0859b25 ]
RFC 5961 5.2 [Blind Data Injection Attack].[Mitigation]
All TCP stacks MAY implement the following mitigation. TCP stacks that implement this mitigation MUST add an additional input check to any incoming segment. The ACK value is considered acceptable only if it is in the range of ((SND.UNA - MAX.SND.WND) <= SEG.ACK <= SND.NXT). All incoming segments whose ACK value doesn't satisfy the above condition MUST be discarded and an ACK sent back.
Move tcp_send_challenge_ack() before tcp_ack() to avoid a forward declaration.
--- net/ipv4/tcp_input.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-)
net/ipv4/tcp_input.c +25 -18
@@ -3579,6 +3579,24 @@ static bool tcp_process_frto(struct sock *sk, int flag)return false; } +/* RFC 5961 7 [ACK Throttling] */ +static void tcp_send_challenge_ack (struct sock *sk) +{ +/* unprotected vars, we dont care of overwrites */ +static u32 challenge_timestamp; +static unsigned int challenge_count; +u32 now = jiffies /HZ ; + +if (now != challenge_timestamp) { + challenge_timestamp = now; + challenge_count =0 ; + } +if (++challenge_count <= sysctl_tcp_challenge_ack_limit) { +NET_INC_STATS_BH (sock_net (sk),LINUX_MIB_TCPCHALLENGEACK ); +tcp_send_ack (sk); + } +} +/* This routine deals with incoming acks, but not outgoing ones. */ static int tcp_ack (struct sock *sk,const struct sk_buff *skb,int flag) {
@@ -3598,8 +3616,14 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)/* If the ack is older than previous acks * then we can probably ignore it. */ -if (before (ack, prior_snd_una)) +if (before (ack, prior_snd_una)) { +/* RFC 5961 5.2 [Blind Data Injection Attack].[Mitigation] */ +if (before (ack, prior_snd_una - tp->max_window)) { +tcp_send_challenge_ack (sk); +return -1 ; + } goto old_ack; + }/* If the ack includes data we haven't sent yet, discard * this segment (RFC793 Section 3.9).
@@ -5271,23 +5295,6 @@ out: }#endif /* CONFIG_NET_DMA */ -static void tcp_send_challenge_ack (struct sock *sk) -{ -/* unprotected vars, we dont care of overwrites */ -static u32 challenge_timestamp; -static unsigned int challenge_count; -u32 now = jiffies /HZ ; - -if (now != challenge_timestamp) { - challenge_timestamp = now; - challenge_count =0 ; - } -if (++challenge_count <= sysctl_tcp_challenge_ack_limit) { -NET_INC_STATS_BH (sock_net (sk),LINUX_MIB_TCPCHALLENGEACK ); -tcp_send_ack (sk); - } -} -/* Does PAWS and seqno based validation of an incoming segment, flags will * play significant role here. */
Signature · 1 line
1.7.10.4
PATCH 8/86 net: prevent setting ttl=0 via IP_TTL
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit c9be4a5c49cf51cc70a993f004c5bb30067a65ce ]
A regression is introduced by the following commit:
commit 4d52cfbef6266092d535237ba5a4b981458ab171 Author: Eric Dumazet <[email protected]> Date: Tue Jun 2 00:42:16 2009 -0700 net: ipv4/ip_sockglue.c cleanups Pure cleanups
but it is not a pure cleanup...
- if (val != -1 && (val < 1 || val>255)) + if (val != -1 && (val < 0 || val > 255))
Since there is no reason provided to allow ttl=0, change it back.
--- net/ipv4/ip_sockglue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ip_sockglue.c +1 -1
@@ -590,7 +590,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,case IP_TTL :if (optlen <1 ) goto e_inval; -if (val !=-1 && (val <0 || val >255 )) +if (val !=-1 && (val <1 || val >255 )) goto e_inval; inet->uc_ttl = val;break ;
Signature · 1 line
1.7.10.4
PATCH 9/86 ipv6: fix the noflags test in addrconf_get_prefix_route
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Romain Kuntz <[email protected]>
[ Upstream commit 85da53bf1c336bb07ac038fb951403ab0478d2c5 ]
The tests on the flags in addrconf_get_prefix_route() does no make much sense: the 'noflags' parameter contains the set of flags that must not match with the route flags, so the test must be done against 'noflags', and not against 'flags'.
--- net/ipv6/addrconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/addrconf.c +1 -1
@@ -1736,7 +1736,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,continue ;if ((rt->rt6i_flags & flags) != flags)continue ; -if ((noflags !=0 ) && ((rt->rt6i_flags & flags) !=0 )) +if ((rt->rt6i_flags & noflags) !=0 )continue ;dst_hold (&rt->dst);break ;
Signature · 1 line
1.7.10.4
PATCH 10/86 MAINTAINERS: Stephen Hemminger email change
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Stephen Hemminger <[email protected]>
[ Upstream commit adbbf69d1a54abf424e91875746a610dcc80017d ]
I changed my email because the vyatta.com mail server is now redirected to brocade.com; and the Brocade mail system is not friendly to Linux desktop users.
--- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
MAINTAINERS +3 -3
@@ -2697,7 +2697,7 @@ S: Maintained F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE -M: Stephen Hemminger <[email protected]> +M: Stephen Hemminger <[email protected]> L: [email protected] L: [email protected] W: http://www.linuxfoundation.org/en/Net:Bridge
@@ -4420,7 +4420,7 @@ S: Maintained MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) M: Mirko Lindner <[email protected]> -M: Stephen Hemminger <[email protected]> +M: Stephen Hemminger <[email protected]> L: [email protected] S: Maintained F: drivers/net/ethernet/marvell/sk*
@@ -4664,7 +4664,7 @@ S: Supported F: drivers/infiniband/hw/nes/ NETEM NETWORK EMULATOR -M: Stephen Hemminger <[email protected]> +M: Stephen Hemminger <[email protected]> L: [email protected] S: Maintained F: net/sched/sch_netem.c
Signature · 1 line
1.7.10.4
PATCH 11/86 ipv6: fix header length calculation in ip6_append_data()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Romain KUNTZ <[email protected]>
[ Upstream commit 7efdba5bd9a2f3e2059beeb45c9fa55eefe1bced ]
Commit 299b0767 (ipv6: Fix IPsec slowpath fragmentation problem) has introduced a error in the header length calculation that provokes corrupted packets when non-fragmentable extensions headers (Destination Option or Routing Header Type 2) are used.
rt->rt6i_nfheader_len is the length of the non-fragmentable extension header, and it should be substracted to rt->dst.header_len, and not to exthdrlen, as it was done before commit 299b0767.
This patch reverts to the original and correct behavior. It has been successfully tested with and without IPsec on packets that include non-fragmentable extensions headers.
--- net/ipv6/ip6_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ip6_output.c +2 -2
@@ -1287,10 +1287,10 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, cork->length =0 ; sk->sk_sndmsg_page =NULL ; sk->sk_sndmsg_off =0 ; - exthdrlen = (opt ? opt->opt_flen :0 ) - rt->rt6i_nfheader_len; + exthdrlen = (opt ? opt->opt_flen :0 ); length += exthdrlen; transhdrlen += exthdrlen; - dst_exthdrlen = rt->dst.header_len; + dst_exthdrlen = rt->dst.header_len - rt->rt6i_nfheader_len; }else { rt = (struct rt6_info *)cork->dst; fl6 = &inet->cork.fl.u.ip6;
Signature · 1 line
1.7.10.4
PATCH 12/86 net: calxedaxgmac: throw away overrun frames
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit d6fb3be544b46a7611a3373fcaa62b5b0be01888 ]
The xgmac driver assumes 1 frame per descriptor. If a frame larger than the descriptor's buffer size is received, the frame will spill over into the next descriptor. So check for received frames that span more than one descriptor and discard them. This prevents a crash if we receive erroneous large packets.
--- drivers/net/ethernet/calxeda/xgmac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/calxeda/xgmac.c +4 -0
@@ -546,6 +546,10 @@ static int desc_get_rx_status(struct xgmac_priv *priv, struct xgmac_dma_desc *p)return -1 ; } +/* All frames should fit into a single buffer */ +if (!(status &RXDESC_FIRST_SEG ) || !(status &RXDESC_LAST_SEG )) +return -1 ; +/* Check if packet has checksum already */ if ((status &RXDESC_FRAME_TYPE ) && (status &RXDESC_EXT_STATUS ) && !(ext_status &RXDESC_IP_PAYLOAD_MASK ))
Signature · 1 line
1.7.10.4
PATCH 13/86 net/mlx4_en: Fix bridged vSwitch configuration for non SRIOV mode
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Yan Burman <[email protected]>
[ Upstream commit 213815a1e6ae70b9648483b110bc5081795f99e8 ]
Commit 5b4c4d36860e "mlx4_en: Allow communication between functions on same host" introduced a regression under which a bridge acting as vSwitch whose uplink is an mlx4 Ethernet device become non-operative in native (non sriov) mode. This happens since broadcast ARP requests sent by VMs were loopback-ed by the HW and hence the bridge learned VM source MACs on both the VM and the uplink ports.
The fix is to place the DMAC in the send WQE only under SRIOV/eSwitch configuration or when the device is in selftest.
--- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_tx.c +9 -4
@@ -630,10 +630,15 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) ring->tx_csum++; } -/* Copy dst mac address to wqe */ - ethh = (struct ethhdr *)skb->data; - tx_desc->ctrl.srcrb_flags16[0 ] =get_unaligned ((__be16 *)ethh->h_dest); - tx_desc->ctrl.imm =get_unaligned ((__be32 *)(ethh->h_dest +2 )); +if (mlx4_is_mfunc (mdev->dev) || priv->validate_loopback) { +/* Copy dst mac address to wqe. This allows loopback in eSwitch, +* so that VFs and PF can communicate with each other +*/ + ethh = (struct ethhdr *)skb->data; + tx_desc->ctrl.srcrb_flags16[0 ] =get_unaligned ((__be16 *)ethh->h_dest); + tx_desc->ctrl.imm =get_unaligned ((__be32 *)(ethh->h_dest +2 )); + } +/* Handle LSO (TSO) packets */ if (lso_header_size) {/* Mark opcode as LSO */
Signature · 1 line
1.7.10.4
PATCH 14/86 net/mlx4_core: Set number of msix vectors under SRIOV mode to firmware defaults
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Or Gerlitz <[email protected]>
[ Upstream commit ca4c7b35f75492de7fbf5ee95be07481c348caee ]
The lines
if (mlx4_is_mfunc(dev)) {
nreq = 2;
} else {which hard code the number of requested msi-x vectors under multi-function mode to two can be removed completely, since the firmware sets num_eqs and reserved_eqs appropriately Thus, the code line:
nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, nreq);
is by itself sufficient and correct for all cases. Currently, for mfunc mode num_eqs = 32 and reserved_eqs = 28, hence four vectors will be enabled.
This triples (one vector is used for the async events and commands EQ) the horse power provided for processing of incoming packets on netdev RSS scheme, IO initiators/targets commands processing flows, etc.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx4/main.c +2 -9
@@ -1630,15 +1630,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)int i;if (msi_x) { -/* In multifunction mode each function gets 2 msi-X vectors -* one for data path completions anf the other for asynch events -* or command completions */ -if (mlx4_is_mfunc (dev)) { - nreq =2 ; - }else { - nreq =min_t (int, dev->caps.num_eqs - - dev->caps.reserved_eqs, nreq); - } + nreq =min_t (int, dev->caps.num_eqs - dev->caps.reserved_eqs, + nreq); entries =kcalloc (nreq,sizeof *entries,GFP_KERNEL );if (!entries)
Signature · 1 line
1.7.10.4
PATCH 15/86 isdn/gigaset: fix zero size border case in debug dump
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Tilman Schmidt <[email protected]>
[ Upstream commit d721a1752ba544df8d7d36959038b26bc92bdf80 ]
If subtracting 12 from l leaves zero we'd do a zero size allocation, leading to an oops later when we try to set the NUL terminator.
--- drivers/isdn/gigaset/capi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/isdn/gigaset/capi.c +2 -0
@@ -248,6 +248,8 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag,CAPIMSG_APPID (data),CAPIMSG_MSGID (data), l, CAPIMSG_CONTROL(data)); l -=12 ; +if (l <=0 ) +return ; dbgline =kmalloc (3 * l,GFP_ATOMIC );if (!dbgline)return ;
Signature · 1 line
1.7.10.4
PATCH 16/86 netxen: fix off by one bug in netxen_release_tx_buffer()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit a05948f296ce103989b28a2606e47d2e287c3c89 ]
Christoph Paasch found netxen could trigger a BUG in its dismantle phase, in netxen_release_tx_buffer(), using full size TSO packets.
cmd_buf->frag_count includes the skb->data part, so the loop must start at index 1 instead of 0, or else we can make an out of bound access to cmd_buff->frag_array[MAX_SKB_FRAGS + 2]
Christoph provided the fixes in netxen_map_tx_skb() function. In case of a dma mapping error, its better to clear the dma fields so that we don't try to unmap them again in netxen_release_tx_buffer()
--- drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +1 -1
@@ -144,7 +144,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter) buffrag->length, PCI_DMA_TODEVICE); buffrag->dma =0ULL ; } -for (j =0 ; j < cmd_buf->frag_count; j++) { +for (j =1 ; j < cmd_buf->frag_count; j++) { buffrag++;if (buffrag->dma) { pci_unmap_page(adapter->pdev, buffrag->dma,
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +2 -0
@@ -1963,10 +1963,12 @@ unwind:while (--i >=0 ) { nf = &pbuf->frag_array[i+1 ];pci_unmap_page (pdev, nf->dma, nf->length,PCI_DMA_TODEVICE ); + nf->dma =0ULL ; } nf = &pbuf->frag_array[0 ];pci_unmap_single (pdev, nf->dma,skb_headlen (skb),PCI_DMA_TODEVICE ); + nf->dma =0ULL ; out_err:return -ENOMEM ;
Signature · 1 line
1.7.10.4
PATCH 17/86 r8169: remove the obsolete and incorrect AMD workaround
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <[email protected]>
[ Upstream commit 5d0feaff230c0abfe4a112e6f09f096ed99e0b2d ]
This was introduced in commit 6dccd16 "r8169: merge with version 6.001.00 of Realtek's r8169 driver". I did not find the version 6.001.00 online, but in 6.002.00 or any later r8169 from Realtek this hunk is no longer present.
Also commit 05af214 "r8169: fix Ethernet Hangup for RTL8110SC rev d" claims to have fixed this issue otherwise.
The magic compare mask of 0xfffe000 is dubious as it masks parts of the Reserved part, and parts of the VLAN tag. But this does not make much sense as the VLAN tag parts are perfectly valid there. In matter of fact this seems to be triggered with any VLAN tagged packet as RxVlanTag bit is matched. I would suspect 0xfffe0000 was intended to test reserved part only.
Finally, this hunk is evil as it can cause more packets to be handled than what was NAPI quota causing net/core/dev.c:net_rx_action(): WARN_ON_ONCE(work > weight) to trigger, and mess up the NAPI state causing device to hang.
As result, any system using VLANs and having high receive traffic (so that NAPI poll budget limits rtl_rx) would result in device hang.
--- drivers/net/ethernet/realtek/r8169.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/net/ethernet/realtek/r8169.c +0 -7
@@ -6088,13 +6088,6 @@ process_pkt: tp->rx_stats.bytes += pkt_size;u64_stats_update_end (&tp->rx_stats.syncp); } - -/* Work around for AMD plateform. */ -if ((desc->opts2 &cpu_to_le32 (0xfffe000 )) && - (tp->mac_version ==RTL_GIGA_MAC_VER_05 )) { - desc->opts2 =0 ; - cur_rx++; - } } count = cur_rx - tp->cur_rx;
Signature · 1 line
1.7.10.4
PATCH 18/86 net: loopback: fix a dst refcounting issue
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 794ed393b707f01858f5ebe2ae5eabaf89d00022 ]
Ben Greear reported crashes in ip_rcv_finish() on a stress test involving many macvlans.
We tracked the bug to a dst use after free. ip_rcv_finish() was calling dst->input() and got garbage for dst->input value.
It appears the bug is in loopback driver, lacking a skb_dst_force() before calling netif_rx().
As a result, a non refcounted dst, normally protected by a RCU read_lock section, was escaping this section and could be freed before the packet being processed.
[<ffffffff813a3c4d>] loopback_xmit+0x64/0x83 [<ffffffff81477364>] dev_hard_start_xmit+0x26c/0x35e [<ffffffff8147771a>] dev_queue_xmit+0x2c4/0x37c [<ffffffff81477456>] ? dev_hard_start_xmit+0x35e/0x35e [<ffffffff8148cfa6>] ? eth_header+0x28/0xb6 [<ffffffff81480f09>] neigh_resolve_output+0x176/0x1a7 [<ffffffff814ad835>] ip_finish_output2+0x297/0x30d [<ffffffff814ad6d5>] ? ip_finish_output2+0x137/0x30d [<ffffffff814ad90e>] ip_finish_output+0x63/0x68 [<ffffffff814ae412>] ip_output+0x61/0x67 [<ffffffff814ab904>] dst_output+0x17/0x1b [<ffffffff814adb6d>] ip_local_out+0x1e/0x23 [<ffffffff814ae1c4>] ip_queue_xmit+0x315/0x353 [<ffffffff814adeaf>] ? ip_send_unicast_reply+0x2cc/0x2cc [<ffffffff814c018f>] tcp_transmit_skb+0x7ca/0x80b [<ffffffff814c3571>] tcp_connect+0x53c/0x587 [<ffffffff810c2f0c>] ? getnstimeofday+0x44/0x7d [<ffffffff810c2f56>] ? ktime_get_real+0x11/0x3e [<ffffffff814c6f9b>] tcp_v4_connect+0x3c2/0x431 [<ffffffff814d6913>] __inet_stream_connect+0x84/0x287 [<ffffffff814d6b38>] ? inet_stream_connect+0x22/0x49 [<ffffffff8108d695>] ? _local_bh_enable_ip+0x84/0x9f [<ffffffff8108d6c8>] ? local_bh_enable+0xd/0x11 [<ffffffff8146763c>] ? lock_sock_nested+0x6e/0x79 [<ffffffff814d6b38>] ? inet_stream_connect+0x22/0x49 [<ffffffff814d6b49>] inet_stream_connect+0x33/0x49 [<ffffffff814632c6>] sys_connect+0x75/0x98
This bug was introduced in linux-2.6.35, in commit 7fee226ad2397b (net: add a noref bit on skb dst)
skb_dst_force() is enforced in dev_queue_xmit() for devices having a qdisc.
--- drivers/net/loopback.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/loopback.c +5 -0
@@ -77,6 +77,11 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,skb_orphan (skb); +/* Before queueing this packet to netif_rx(), +* make sure dst is refcounted. +*/ +skb_dst_force (skb); + skb->protocol =eth_type_trans (skb, dev);/* it's OK to use per_cpu_ptr() because BHs are off */
Signature · 1 line
1.7.10.4
PATCH 19/86 pktgen: correctly handle failures when adding a device
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 604dfd6efc9b79bce432f2394791708d8e8f6efc ]
The return value of pktgen_add_device() is not checked, so even if we fail to add some device, for example, non-exist one, we still see "OK:...". This patch fixes it.
After this patch, I got:
# echo "add_device non-exist" > /proc/net/pktgen/kpktgend_0 -bash: echo: write error: No such device # cat /proc/net/pktgen/kpktgend_0 Running: Stopped: Result: ERROR: can not add device non-exist # echo "add_device eth0" > /proc/net/pktgen/kpktgend_0 # cat /proc/net/pktgen/kpktgend_0 Running: Stopped: eth0 Result: OK: add_device=eth0
(Candidate for -stable)
--- net/core/pktgen.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/core/pktgen.c +6 -3
@@ -1797,10 +1797,13 @@ static ssize_t pktgen_thread_write(struct file *file,return -EFAULT ; i += len;mutex_lock (&pktgen_thread_lock); -pktgen_add_device (t, f); + ret =pktgen_add_device (t, f);mutex_unlock (&pktgen_thread_lock); - ret = count; -sprintf (pg_result,"OK: add_device=%s" , f); +if (!ret) { + ret = count; +sprintf (pg_result,"OK: add_device=%s" , f); + }else +sprintf (pg_result,"ERROR: can not add device %s" , f); goto out; }
Signature · 1 line
1.7.10.4
PATCH 20/86 ipv6: do not create neighbor entries for local delivery
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit bd30e947207e2ea0ff2c08f5b4a03025ddce48d3 ]
They will be created at output, if ever needed. This avoids creating empty neighbor entries when TPROXYing/Forwarding packets for addresses that are not even directly reachable.
Note that IPv4 already handles it this way. No neighbor entries are created for local input.
Tested by myself and customer.
--- net/ipv6/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/route.c +1 -1
@@ -881,7 +881,7 @@ restart:dst_hold (&rt->dst);read_unlock_bh (&table->tb6_lock); -if (!rt->n && !(rt->rt6i_flags &RTF_NONEXTHOP )) +if (!rt->n && !(rt->rt6i_flags & (RTF_NONEXTHOP |RTF_LOCAL ))) nrt =rt6_alloc_cow (rt, &fl6->daddr, &fl6->saddr);else if (!(rt->dst.flags &DST_HOST )) nrt =rt6_alloc_clone (rt, &fl6->daddr);
Signature · 1 line
1.7.10.4
PATCH 21/86 via-rhine: Fix bugs in NAPI support.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 559bcac35facfed49ab4f408e162971612dcfdf3 ]
1) rhine_tx() should use dev_kfree_skb() not dev_kfree_skb_irq()
2) rhine_slow_event_task's NAPI triggering logic is racey, it should just hit the interrupt mask register. This is the same as commit 7dbb491878a2c51d372a8890fa45a8ff80358af1 ("r8169: avoid NAPI scheduling delay.") made to fix the same problem in the r8169 driver. From Francois Romieu.
--- drivers/net/ethernet/via/via-rhine.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/ethernet/via/via-rhine.c +2 -6
@@ -1802,7 +1802,7 @@ static void rhine_tx(struct net_device *dev) rp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE); } -dev_kfree_skb_irq (rp->tx_skbuff[entry]); +dev_kfree_skb (rp->tx_skbuff[entry]); rp->tx_skbuff[entry] =NULL ; entry = (++rp->dirty_tx) %TX_RING_SIZE ; }
@@ -2011,11 +2011,7 @@ static void rhine_slow_event_task(struct work_struct *work)if (intr_status & IntrPCIErr)netif_warn (rp, hw, dev,"PCI error\n" ); -napi_disable (&rp->napi); -rhine_irq_disable (rp); -/* Slow and safe. Consider __napi_schedule as a replacement ? */ -napi_enable (&rp->napi); -napi_schedule (&rp->napi); +iowrite16 (RHINE_EVENT &0xffff , rp->base + IntrEnable); out_unlock:mutex_unlock (&rp->task_lock);
Signature · 1 line
1.7.10.4
PATCH 22/86 packet: fix leakage of tx_ring memory
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Phil Sutter <[email protected]>
[ Upstream commit 9665d5d62487e8e7b1f546c00e11107155384b9a ]
When releasing a packet socket, the routine packet_set_ring() is reused to free rings instead of allocating them. But when calling it for the first time, it fills req->tp_block_nr with the value of rb->pg_vec_len which in the second invocation makes it bail out since req->tp_block_nr is greater zero but req->tp_block_size is zero.
This patch solves the problem by passing a zeroed auto-variable to packet_set_ring() upon each invocation from packet_release().
As far as I can tell, this issue exists even since 69e3c75 (net: TX_RING and packet mmap), i.e. the original inclusion of TX ring support into af_packet, but applies only to sockets with both RX and TX ring allocated, which is probably why this was unnoticed all the time.
--- net/packet/af_packet.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/packet/af_packet.c +6 -4
@@ -2443,13 +2443,15 @@ static int packet_release(struct socket *sock)packet_flush_mclist (sk); -memset (&req_u,0 ,sizeof (req_u)); - -if (po->rx_ring.pg_vec) +if (po->rx_ring.pg_vec) { +memset (&req_u,0 ,sizeof (req_u));packet_set_ring (sk, &req_u,1 ,0 ); + } -if (po->tx_ring.pg_vec) +if (po->tx_ring.pg_vec) { +memset (&req_u,0 ,sizeof (req_u));packet_set_ring (sk, &req_u,1 ,1 ); + }fanout_release (sk);
Signature · 1 line
1.7.10.4
PATCH 23/86 atm/iphase: rename fregt_t -> ffreg_t
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
[ Upstream commit ab54ee80aa7585f9666ff4dd665441d7ce41f1e8 ]
We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the iphase atm device driver, which causes the compile error below. Unfortunately the s390 typedef can't be renamed, since it's a user visible api, nor can I change the include order in s390 code to avoid the conflict.
So simply rename the iphase typedef to a new name. Fixes this compile error:
In file included from drivers/atm/iphase.c:66:0:drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t' In file included from next/arch/s390/include/asm/ptrace.h:9:0,
from next/arch/s390/include/asm/lowcore.h:12,
from next/arch/s390/include/asm/thread_info.h:30,
from include/linux/thread_info.h:54,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:5,
from include/linux/stat.h:18,
from include/linux/module.h:10,
from drivers/atm/iphase.c:43:next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of 'freg_t' was here
--- drivers/atm/iphase.h | 146 +++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 73 deletions(-)
drivers/atm/iphase.h +73 -73
@@ -636,82 +636,82 @@ struct rx_buf_desc {#define SEG_BASE IPHASE5575_FRAG_CONTROL_REG_BASE#define REASS_BASE IPHASE5575_REASS_CONTROL_REG_BASE -typedef volatile u_int freg_t ; +typedef volatile u_int ffreg_t ;typedef u_int rreg_t ;typedef struct _ffredn_t { -freg_t idlehead_high;/* Idle cell header (high) */ -freg_t idlehead_low;/* Idle cell header (low) */ -freg_t maxrate;/* Maximum rate */ -freg_t stparms;/* Traffic Management Parameters */ -freg_t abrubr_abr;/* ABRUBR Priority Byte 1, TCR Byte 0 */ -freg_t rm_type;/* */ -u_int filler5[0x17 -0x06 ]; -freg_t cmd_reg;/* Command register */ -u_int filler18[0x20 -0x18 ]; -freg_t cbr_base;/* CBR Pointer Base */ -freg_t vbr_base;/* VBR Pointer Base */ -freg_t abr_base;/* ABR Pointer Base */ -freg_t ubr_base;/* UBR Pointer Base */ -u_int filler24; -freg_t vbrwq_base;/* VBR Wait Queue Base */ -freg_t abrwq_base;/* ABR Wait Queue Base */ -freg_t ubrwq_base;/* UBR Wait Queue Base */ -freg_t vct_base;/* Main VC Table Base */ -freg_t vcte_base;/* Extended Main VC Table Base */ -u_int filler2a[0x2C -0x2A ]; -freg_t cbr_tab_beg;/* CBR Table Begin */ -freg_t cbr_tab_end;/* CBR Table End */ -freg_t cbr_pointer;/* CBR Pointer */ -u_int filler2f[0x30 -0x2F ]; -freg_t prq_st_adr;/* Packet Ready Queue Start Address */ -freg_t prq_ed_adr;/* Packet Ready Queue End Address */ -freg_t prq_rd_ptr;/* Packet Ready Queue read pointer */ -freg_t prq_wr_ptr;/* Packet Ready Queue write pointer */ -freg_t tcq_st_adr;/* Transmit Complete Queue Start Address*/ -freg_t tcq_ed_adr;/* Transmit Complete Queue End Address */ -freg_t tcq_rd_ptr;/* Transmit Complete Queue read pointer */ -freg_t tcq_wr_ptr;/* Transmit Complete Queue write pointer*/ -u_int filler38[0x40 -0x38 ]; -freg_t queue_base;/* Base address for PRQ and TCQ */ -freg_t desc_base;/* Base address of descriptor table */ -u_int filler42[0x45 -0x42 ]; -freg_t mode_reg_0;/* Mode register 0 */ -freg_t mode_reg_1;/* Mode register 1 */ -freg_t intr_status_reg;/* Interrupt Status register */ -freg_t mask_reg;/* Mask Register */ -freg_t cell_ctr_high1;/* Total cell transfer count (high) */ -freg_t cell_ctr_lo1;/* Total cell transfer count (low) */ -freg_t state_reg;/* Status register */ -u_int filler4c[0x58 -0x4c ]; -freg_t curr_desc_num;/* Contains the current descriptor num */ -freg_t next_desc;/* Next descriptor */ -freg_t next_vc;/* Next VC */ -u_int filler5b[0x5d -0x5b ]; -freg_t present_slot_cnt;/* Present slot count */ -u_int filler5e[0x6a -0x5e ]; -freg_t new_desc_num;/* New descriptor number */ -freg_t new_vc;/* New VC */ -freg_t sched_tbl_ptr;/* Schedule table pointer */ -freg_t vbrwq_wptr;/* VBR wait queue write pointer */ -freg_t vbrwq_rptr;/* VBR wait queue read pointer */ -freg_t abrwq_wptr;/* ABR wait queue write pointer */ -freg_t abrwq_rptr;/* ABR wait queue read pointer */ -freg_t ubrwq_wptr;/* UBR wait queue write pointer */ -freg_t ubrwq_rptr;/* UBR wait queue read pointer */ -freg_t cbr_vc;/* CBR VC */ -freg_t vbr_sb_vc;/* VBR SB VC */ -freg_t abr_sb_vc;/* ABR SB VC */ -freg_t ubr_sb_vc;/* UBR SB VC */ -freg_t vbr_next_link;/* VBR next link */ -freg_t abr_next_link;/* ABR next link */ -freg_t ubr_next_link;/* UBR next link */ -u_int filler7a[0x7c -0x7a ]; -freg_t out_rate_head;/* Out of rate head */ -u_int filler7d[0xca -0x7d ];/* pad out to full address space */ -freg_t cell_ctr_high1_nc;/* Total cell transfer count (high) */ -freg_t cell_ctr_lo1_nc;/* Total cell transfer count (low) */ -u_int fillercc[0x100 -0xcc ];/* pad out to full address space */ +ffreg_t idlehead_high;/* Idle cell header (high) */ +ffreg_t idlehead_low;/* Idle cell header (low) */ +ffreg_t maxrate;/* Maximum rate */ +ffreg_t stparms;/* Traffic Management Parameters */ +ffreg_t abrubr_abr;/* ABRUBR Priority Byte 1, TCR Byte 0 */ +ffreg_t rm_type;/* */ +u_int filler5[0x17 -0x06 ]; +ffreg_t cmd_reg;/* Command register */ +u_int filler18[0x20 -0x18 ]; +ffreg_t cbr_base;/* CBR Pointer Base */ +ffreg_t vbr_base;/* VBR Pointer Base */ +ffreg_t abr_base;/* ABR Pointer Base */ +ffreg_t ubr_base;/* UBR Pointer Base */ +u_int filler24; +ffreg_t vbrwq_base;/* VBR Wait Queue Base */ +ffreg_t abrwq_base;/* ABR Wait Queue Base */ +ffreg_t ubrwq_base;/* UBR Wait Queue Base */ +ffreg_t vct_base;/* Main VC Table Base */ +ffreg_t vcte_base;/* Extended Main VC Table Base */ +u_int filler2a[0x2C -0x2A ]; +ffreg_t cbr_tab_beg;/* CBR Table Begin */ +ffreg_t cbr_tab_end;/* CBR Table End */ +ffreg_t cbr_pointer;/* CBR Pointer */ +u_int filler2f[0x30 -0x2F ]; +ffreg_t prq_st_adr;/* Packet Ready Queue Start Address */ +ffreg_t prq_ed_adr;/* Packet Ready Queue End Address */ +ffreg_t prq_rd_ptr;/* Packet Ready Queue read pointer */ +ffreg_t prq_wr_ptr;/* Packet Ready Queue write pointer */ +ffreg_t tcq_st_adr;/* Transmit Complete Queue Start Address*/ +ffreg_t tcq_ed_adr;/* Transmit Complete Queue End Address */ +ffreg_t tcq_rd_ptr;/* Transmit Complete Queue read pointer */ +ffreg_t tcq_wr_ptr;/* Transmit Complete Queue write pointer*/ +u_int filler38[0x40 -0x38 ]; +ffreg_t queue_base;/* Base address for PRQ and TCQ */ +ffreg_t desc_base;/* Base address of descriptor table */ +u_int filler42[0x45 -0x42 ]; +ffreg_t mode_reg_0;/* Mode register 0 */ +ffreg_t mode_reg_1;/* Mode register 1 */ +ffreg_t intr_status_reg;/* Interrupt Status register */ +ffreg_t mask_reg;/* Mask Register */ +ffreg_t cell_ctr_high1;/* Total cell transfer count (high) */ +ffreg_t cell_ctr_lo1;/* Total cell transfer count (low) */ +ffreg_t state_reg;/* Status register */ +u_int filler4c[0x58 -0x4c ]; +ffreg_t curr_desc_num;/* Contains the current descriptor num */ +ffreg_t next_desc;/* Next descriptor */ +ffreg_t next_vc;/* Next VC */ +u_int filler5b[0x5d -0x5b ]; +ffreg_t present_slot_cnt;/* Present slot count */ +u_int filler5e[0x6a -0x5e ]; +ffreg_t new_desc_num;/* New descriptor number */ +ffreg_t new_vc;/* New VC */ +ffreg_t sched_tbl_ptr;/* Schedule table pointer */ +ffreg_t vbrwq_wptr;/* VBR wait queue write pointer */ +ffreg_t vbrwq_rptr;/* VBR wait queue read pointer */ +ffreg_t abrwq_wptr;/* ABR wait queue write pointer */ +ffreg_t abrwq_rptr;/* ABR wait queue read pointer */ +ffreg_t ubrwq_wptr;/* UBR wait queue write pointer */ +ffreg_t ubrwq_rptr;/* UBR wait queue read pointer */ +ffreg_t cbr_vc;/* CBR VC */ +ffreg_t vbr_sb_vc;/* VBR SB VC */ +ffreg_t abr_sb_vc;/* ABR SB VC */ +ffreg_t ubr_sb_vc;/* UBR SB VC */ +ffreg_t vbr_next_link;/* VBR next link */ +ffreg_t abr_next_link;/* ABR next link */ +ffreg_t ubr_next_link;/* UBR next link */ +u_int filler7a[0x7c -0x7a ]; +ffreg_t out_rate_head;/* Out of rate head */ +u_int filler7d[0xca -0x7d ];/* pad out to full address space */ +ffreg_t cell_ctr_high1_nc;/* Total cell transfer count (high) */ +ffreg_t cell_ctr_lo1_nc;/* Total cell transfer count (low) */ +u_int fillercc[0x100 -0xcc ];/* pad out to full address space */ }ffredn_t ; typedef struct _rfredn_t {
Signature · 1 line
1.7.10.4
PATCH 24/86 sctp: refactor sctp_outq_teardown to insure proper re-initalization
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Neil Horman <[email protected]>
[ Upstream commit 2f94aabd9f6c925d77aecb3ff020f1cc12ed8f86 ]
Jamie Parsons reported a problem recently, in which the re-initalization of an association (The duplicate init case), resulted in a loss of receive window space. He tracked down the root cause to sctp_outq_teardown, which discarded all the data on an outq during a re-initalization of the corresponding association, but never reset the outq->outstanding_data field to zero. I wrote, and he tested this fix, which does a proper full re-initalization of the outq, fixing this problem, and hopefully future proofing us from simmilar issues down the road.
--- net/sctp/outqueue.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/sctp/outqueue.c +8 -4
@@ -223,7 +223,7 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)/* Free the outqueue structure and any related pending chunks. */ -void sctp_outq_teardown (struct sctp_outq *q) +static void __sctp_outq_teardown (struct sctp_outq *q) {struct sctp_transport *transport;struct list_head *lchunk, *temp;
@@ -276,8 +276,6 @@ void sctp_outq_teardown(struct sctp_outq *q)sctp_chunk_free (chunk); } - q->error =0 ; -/* Throw away any leftover control chunks. */ list_for_each_entry_safe (chunk, tmp, &q->control_chunk_list, list) {list_del_init (&chunk->list);
@@ -285,11 +283,17 @@ void sctp_outq_teardown(struct sctp_outq *q) } } +void sctp_outq_teardown (struct sctp_outq *q) +{ +__sctp_outq_teardown (q); +sctp_outq_init (q->asoc, q); +} +/* Free the outqueue structure and any related pending chunks. */ void sctp_outq_free (struct sctp_outq *q) {/* Throw away leftover chunks. */ -sctp_outq_teardown (q); +__sctp_outq_teardown (q);/* If we were kmalloc()'d, free the memory. */ if (q->malloced)
Signature · 1 line
1.7.10.4
PATCH 25/86 net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 6ba542a291a5e558603ac51cda9bded347ce7627 ]
In sctp_setsockopt_auth_key, we create a temporary copy of the user passed shared auth key for the endpoint or association and after internal setup, we free it right away. Since it's sensitive data, we should zero out the key before returning the memory back to the allocator. Thus, use kzfree instead of kfree, just as we do in sctp_auth_key_put().
--- net/sctp/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sctp/socket.c +1 -1
@@ -3375,7 +3375,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk, ret =sctp_auth_set_key (sctp_sk (sk)->ep, asoc, authkey); out: -kfree (authkey); +kzfree (authkey);return ret; }
Signature · 1 line
1.7.10.4
PATCH 26/86 net: sctp: sctp_endpoint_free: zero out secret key data
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit b5c37fe6e24eec194bb29d22fdd55d73bcc709bf ]
On sctp_endpoint_destroy, previously used sensitive keying material should be zeroed out before the memory is returned, as we already do with e.g. auth keys when released.
--- net/sctp/endpointola.c | 5 +++++ 1 file changed, 5 insertions(+)
net/sctp/endpointola.c +5 -0
@@ -248,6 +248,8 @@ void sctp_endpoint_free(struct sctp_endpoint *ep)/* Final destructor for endpoint. */ static void sctp_endpoint_destroy (struct sctp_endpoint *ep) { +int i; +SCTP_ASSERT (ep->base.dead,"Endpoint is not dead" , return);/* Free up the HMAC transform. */
@@ -270,6 +272,9 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)sctp_inq_free (&ep->base.inqueue);sctp_bind_addr_free (&ep->base.bind_addr); +for (i =0 ; i <SCTP_HOW_MANY_SECRETS ; ++i) +memset (&ep->secret_key[i],0 ,SCTP_SECRET_SIZE ); +/* Remove and free the port */ if (sctp_sk (ep->base.sk)->bind_hash)sctp_put_port (ep->base.sk);
Signature · 1 line
1.7.10.4
PATCH 27/86 xen/netback: shutdown the ring if it contains garbage.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ian Campbell <[email protected]>
[ Upstream commit 48856286b64e4b66ec62b94e504d0b29c1ade664 ]
A buggy or malicious frontend should not be able to confuse netback. If we spot anything which is not as it should be then shutdown the device and don't try to continue with the ring in a potentially hostile state. Well behaved and non-hostile frontends will not be penalised.
As well as making the existing checks for such errors fatal also add a new check that ensures that there isn't an insane number of requests on the ring (i.e. more than would fit in the ring). If the ring contains garbage then previously is was possible to loop over this insane number, getting an error each time and therefore not generating any more pending requests and therefore not exiting the loop in xen_netbk_tx_build_gops for an externded period.
Also turn various netdev_dbg calls which no precipitate a fatal error into netdev_err, they are rate limited because the device is shutdown afterwards.
This fixes at least one known DoS/softlockup of the backend domain.
--- drivers/net/xen-netback/common.h | 3 ++ drivers/net/xen-netback/interface.c | 23 ++++++++----- drivers/net/xen-netback/netback.c | 62 +++++++++++++++++++++++++---------- 3 files changed, 62 insertions(+), 26 deletions(-)
drivers/net/xen-netback/common.h +3 -0
@@ -151,6 +151,9 @@ void xen_netbk_queue_tx_skb(struct xenvif *vif, struct sk_buff *skb);/* Notify xenvif that ring now has space to send an skb to the frontend */ void xenvif_notify_tx_completion (struct xenvif *vif); +/* Prevent the device from generating any further traffic. */ +void xenvif_carrier_off (struct xenvif *vif); +/* Returns number of ring slots required to send an skb to the frontend */ unsigned int xen_netbk_count_skb_slots (struct xenvif *vif,struct sk_buff *skb);
drivers/net/xen-netback/interface.c +14 -9
@@ -343,17 +343,22 @@ err:return err; } -void xenvif_disconnect (struct xenvif *vif) +void xenvif_carrier_off (struct xenvif *vif) {struct net_device *dev = vif->dev; -if (netif_carrier_ok (dev)) { -rtnl_lock (); -netif_carrier_off (dev);/* discard queued packets */ -if (netif_running (dev)) -xenvif_down (vif); -rtnl_unlock (); -xenvif_put (vif); - } + +rtnl_lock (); +netif_carrier_off (dev);/* discard queued packets */ +if (netif_running (dev)) +xenvif_down (vif); +rtnl_unlock (); +xenvif_put (vif); +} + +void xenvif_disconnect (struct xenvif *vif) +{ +if (netif_carrier_ok (vif->dev)) +xenvif_carrier_off (vif);atomic_dec (&vif->refcnt);wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 );
drivers/net/xen-netback/netback.c +45 -17
151 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 28/86 xen/netback: dont leak pages on failure in xen_netbk_tx_check_gop.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Matthew Daley <[email protected]>
[ Upstream commit 7d5145d8eb2b9791533ffe4dc003b129b9696c48 ]
--- drivers/net/xen-netback/netback.c | 38 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 25 deletions(-)
drivers/net/xen-netback/netback.c +13 -25
@@ -146,7 +146,8 @@ void xen_netbk_remove_xenvif(struct xenvif *vif)atomic_dec (&netbk->netfront_count); } -static void xen_netbk_idx_release (struct xen_netbk *netbk,u16 pending_idx); +static void xen_netbk_idx_release (struct xen_netbk *netbk,u16 pending_idx, +u8 status);static void make_tx_response (struct xenvif *vif,struct xen_netif_tx_request *txp,s8 st);
@@ -978,30 +979,20 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk, {struct gnttab_copy *gop = *gopp;u16 pending_idx = *((u16 *)skb->data); -struct pending_tx_info *pending_tx_info = netbk->pending_tx_info; -struct xenvif *vif = pending_tx_info[pending_idx].vif; -struct xen_netif_tx_request *txp;struct skb_shared_info *shinfo =skb_shinfo (skb);int nr_frags = shinfo->nr_frags;int i, err, start;/* Check status of header. */ err = gop->status; -if (unlikely (err)) { -pending_ring_idx_t index; - index =pending_index (netbk->pending_prod++); - txp = &pending_tx_info[pending_idx].req; -make_tx_response (vif, txp,XEN_NETIF_RSP_ERROR ); - netbk->pending_ring[index] = pending_idx; -xenvif_put (vif); - } +if (unlikely (err)) +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_ERROR );/* Skip first skb fragment if it is on same page as header fragment. */ start = (frag_get_pending_idx (&shinfo->frags[0 ]) == pending_idx);for (i = start; i < nr_frags; i++) {int j, newerr; -pending_ring_idx_t index; pending_idx =frag_get_pending_idx (&shinfo->frags[i]);
@@ -1010,16 +1001,12 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,if (likely (!newerr)) {/* Had a previous error? Invalidate this fragment. */ if (unlikely (err)) -xen_netbk_idx_release (netbk, pending_idx); +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_OKAY );continue ; }/* Error on this fragment: respond to client with an error. */ - txp = &netbk->pending_tx_info[pending_idx].req; -make_tx_response (vif, txp,XEN_NETIF_RSP_ERROR ); - index =pending_index (netbk->pending_prod++); - netbk->pending_ring[index] = pending_idx; -xenvif_put (vif); +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_ERROR );/* Not the first error? Preceding frags already invalidated. */ if (err)
@@ -1027,10 +1014,10 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,/* First error: invalidate header and preceding fragments. */ pending_idx = *((u16 *)skb->data); -xen_netbk_idx_release (netbk, pending_idx); +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_OKAY );for (j = start; j < i; j++) { pending_idx =frag_get_pending_idx (&shinfo->frags[j]); -xen_netbk_idx_release (netbk, pending_idx); +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_OKAY ); }/* Remember the error: invalidate all subsequent fragments. */
@@ -1064,7 +1051,7 @@ static void xen_netbk_fill_frags(struct xen_netbk *netbk, struct sk_buff *skb)/* Take an extra reference to offset xen_netbk_idx_release */ get_page (netbk->mmap_pages[pending_idx]); -xen_netbk_idx_release (netbk, pending_idx); +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_OKAY ); } }
@@ -1447,7 +1434,7 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk) txp->size -= data_len; }else {/* Schedule a response immediately. */ -xen_netbk_idx_release (netbk, pending_idx); +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_OKAY ); }if (txp->flags & XEN_NETTXF_csum_blank)
@@ -1502,7 +1489,8 @@ static void xen_netbk_tx_action(struct xen_netbk *netbk) } -static void xen_netbk_idx_release (struct xen_netbk *netbk,u16 pending_idx) +static void xen_netbk_idx_release (struct xen_netbk *netbk,u16 pending_idx, +u8 status) {struct xenvif *vif;struct pending_tx_info *pending_tx_info;
@@ -1516,7 +1504,7 @@ static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx) vif = pending_tx_info->vif; -make_tx_response (vif, &pending_tx_info->req,XEN_NETIF_RSP_OKAY ); +make_tx_response (vif, &pending_tx_info->req, status); index =pending_index (netbk->pending_prod++); netbk->pending_ring[index] = pending_idx;
Signature · 1 line
1.7.10.4
PATCH 29/86 xen/netback: free already allocated memory on failure in xen_netbk_get_requests
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ian Campbell <[email protected]>
[ Upstream commit 4cc7c1cb7b11b6f3515bd9075527576a1eecc4aa ]
--- drivers/net/xen-netback/netback.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/xen-netback/netback.c +12 -1
@@ -949,7 +949,7 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk, pending_idx = netbk->pending_ring[index]; page =xen_netbk_alloc_page (netbk, skb, pending_idx);if (!page) -return NULL ; + goto err; gop->source.u.ref = txp->gref; gop->source.domid = vif->domid;
@@ -971,6 +971,17 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk, }return gop; +err: +/* Unwind, freeing all pages and sending error responses. */ +while (i-- > start) { +xen_netbk_idx_release (netbk,frag_get_pending_idx (&frags[i]), +XEN_NETIF_RSP_ERROR ); + } +/* The head too, if necessary. */ +if (start) +xen_netbk_idx_release (netbk, pending_idx,XEN_NETIF_RSP_ERROR ); + +return NULL ; } static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
Signature · 1 line
1.7.10.4
PATCH 30/86 netback: correct netbk_tx_err to handle wrap around.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ian Campbell <[email protected]>
[ Upstream commit b9149729ebdcfce63f853aa54a404c6a8f6ebbf3 ]
--- drivers/net/xen-netback/netback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/xen-netback/netback.c +1 -1
@@ -851,7 +851,7 @@ static void netbk_tx_err(struct xenvif *vif,do {make_tx_response (vif, txp,XEN_NETIF_RSP_ERROR ); -if (cons >= end) +if (cons == end)break ; txp =RING_GET_REQUEST (&vif->tx, cons++); }while (1 );
Signature · 1 line
1.7.10.4
PATCH 31/86 tcp: frto should not set snd_cwnd to 0
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 2e5f421211ff76c17130b4597bc06df4eeead24f ]
Commit 9dc274151a548 (tcp: fix ABC in tcp_slow_start()) uncovered a bug in FRTO code :tcp_process_frto() is setting snd_cwnd to 0 if the number of in flight packets is 0.
As Neal pointed out, if no packet is in flight we lost our chance to disambiguate whether a loss timeout was spurious.
We should assume it was a proper loss.
--- net/ipv4/tcp_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/tcp_input.c +2 -1
@@ -3511,7 +3511,8 @@ static bool tcp_process_frto(struct sock *sk, int flag) ((tp->frto_counter >= 2) && (flag & FLAG_RETRANS_DATA_ACKED))) tp->undo_marker = 0; -if (!before (tp->snd_una, tp->frto_highmark)) { +if (!before (tp->snd_una, tp->frto_highmark) || + !tcp_packets_in_flight (tp)) {tcp_enter_frto_loss (sk, (tp->frto_counter ==1 ?2 :3 ), flag);return true; }
Signature · 1 line
1.7.10.4
PATCH 32/86 tcp: fix for zero packets_in_flight was too broad
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <[email protected]>
[ Upstream commit 6731d2095bd4aef18027c72ef845ab1087c3ba63 ]
There are transients during normal FRTO procedure during which the packets_in_flight can go to zero between write_queue state updates and firing the resulting segments out. As FRTO processing occurs during that window the check must be more precise to not match "spuriously" :-). More specificly, e.g., when packets_in_flight is zero but FLAG_DATA_ACKED is true the problematic branch that set cwnd into zero would not be taken and new segments might be sent out later.
--- net/ipv4/tcp_input.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/ipv4/tcp_input.c +6 -2
@@ -3511,8 +3511,7 @@ static bool tcp_process_frto(struct sock *sk, int flag) ((tp->frto_counter >= 2) && (flag & FLAG_RETRANS_DATA_ACKED))) tp->undo_marker = 0; -if (!before (tp->snd_una, tp->frto_highmark) || - !tcp_packets_in_flight (tp)) { +if (!before (tp->snd_una, tp->frto_highmark)) {tcp_enter_frto_loss (sk, (tp->frto_counter ==1 ?2 :3 ), flag);return true; }
@@ -3532,6 +3531,11 @@ static bool tcp_process_frto(struct sock *sk, int flag) } }else {if (!(flag &FLAG_DATA_ACKED ) && (tp->frto_counter ==1 )) { +if (!tcp_packets_in_flight (tp)) { +tcp_enter_frto_loss (sk,2 , flag); +return true; + } +/* Prevent sending of new data. */ tp->snd_cwnd =min (tp->snd_cwnd,tcp_packets_in_flight (tp));
Signature · 1 line
1.7.10.4
PATCH 33/86 bridge: Pull ip header into skb->data before looking into ip header.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sarveshwar Bandi <[email protected]>
[ Upstream commit 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 ]
If lower layer driver leaves the ip header in the skb fragment, it needs to be first pulled into skb->data before inspecting ip header length or ip version number.
--- net/bridge/br_netfilter.c | 3 +++ 1 file changed, 3 insertions(+)
net/bridge/br_netfilter.c +3 -0
@@ -265,6 +265,9 @@ static int br_parse_ip_options(struct sk_buff *skb)struct net_device *dev = skb->dev;u32 len; +if (!pskb_may_pull (skb,sizeof (struct iphdr ))) + goto inhdr_error; + iph =ip_hdr (skb); opt = &(IPCB (skb)->opt);
Signature · 1 line
1.7.10.4
PATCH 34/86 tg3: Avoid null pointer dereference in tg3_interrupt in netconsole mode
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Nithin Nayak Sujir <[email protected]>
[ Upstream commit 9c13cb8bb477a83b9a3c9e5a5478a4e21294a760 ]
When netconsole is enabled, logging messages generated during tg3_open can result in a null pointer dereference for the uninitialized tg3 status block. Use the irq_sync flag to disable polling in the early stages. irq_sync is cleared when the driver is enabling interrupts after all initialization is completed.
--- drivers/net/ethernet/broadcom/tg3.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/broadcom/tg3.c +4 -0
@@ -6703,6 +6703,9 @@ static void tg3_poll_controller(struct net_device *dev)int i;struct tg3 *tp =netdev_priv (dev); +if (tg3_irq_sync (tp)) +return ; +for (i =0 ; i < tp->irq_cnt; i++)tg3_interrupt (tp->napi[i].irq_vec, &tp->napi[i]); }
@@ -15806,6 +15809,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, tp->pm_cap = pm_cap; tp->rx_mode =TG3_DEF_RX_MODE ; tp->tx_mode =TG3_DEF_TX_MODE ; + tp->irq_sync =1 ;if (tg3_debug >0 ) tp->msg_enable = tg3_debug;
Signature · 1 line
1.7.10.4
PATCH 35/86 tg3: Fix crc errors on jumbo frame receive
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Nithin Nayak Sujir <[email protected]>
[ Upstream commit daf3ec688e057f6060fb9bb0819feac7a8bbf45c ]
TG3_PHY_AUXCTL_SMDSP_ENABLE/DISABLE macros do a blind write to the phy auxiliary control register and overwrite the EXT_PKT_LEN (bit 14) resulting in intermittent crc errors on jumbo frames with some link partners. Change the code to do a read/modify/write.
--- drivers/net/ethernet/broadcom/tg3.c | 58 +++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 23 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +35 -23
@@ -1245,14 +1245,26 @@ static int tg3_phy_auxctl_write(struct tg3 *tp, int reg, u32 set)return tg3_writephy (tp,MII_TG3_AUX_CTRL , set | reg); } -#define TG3_PHY_AUXCTL_SMDSP_ENABLE (tp) \ - tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \ - MII_TG3_AUXCTL_ACTL_SMDSP_ENA | \ - MII_TG3_AUXCTL_ACTL_TX_6DB) +static int tg3_phy_toggle_auxctl_smdsp (struct tg3 *tp,bool enable) +{ +u32 val; +int err; + + err =tg3_phy_auxctl_read (tp,MII_TG3_AUXCTL_SHDWSEL_AUXCTL , &val); -#define TG3_PHY_AUXCTL_SMDSP_DISABLE (tp) \ - tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \ - MII_TG3_AUXCTL_ACTL_TX_6DB); +if (err) +return err; +if (enable) + + val |=MII_TG3_AUXCTL_ACTL_SMDSP_ENA ; +else + val &= ~MII_TG3_AUXCTL_ACTL_SMDSP_ENA ; + + err =tg3_phy_auxctl_write ((tp),MII_TG3_AUXCTL_SHDWSEL_AUXCTL , + val |MII_TG3_AUXCTL_ACTL_TX_6DB ); + +return err; +}static int tg3_bmcr_reset (struct tg3 *tp) {
@@ -2185,7 +2197,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp) otp = tp->phy_otp; -if (TG3_PHY_AUXCTL_SMDSP_ENABLE (tp)) +if (tg3_phy_toggle_auxctl_smdsp (tp, true))return ; phy = ((otp &TG3_OTP_AGCTGT_MASK ) >>TG3_OTP_AGCTGT_SHIFT );
@@ -2210,7 +2222,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp) ((otp &TG3_OTP_RCOFF_MASK ) >>TG3_OTP_RCOFF_SHIFT );tg3_phydsp_write (tp,MII_TG3_DSP_EXP97 , phy); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false); }static void tg3_phy_eee_adjust (struct tg3 *tp,u32 current_link_up)
@@ -2246,9 +2258,9 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)if (!tp->setlpicnt) {if (current_link_up ==1 && - !TG3_PHY_AUXCTL_SMDSP_ENABLE (tp)) { + !tg3_phy_toggle_auxctl_smdsp (tp, true)) {tg3_phydsp_write (tp,MII_TG3_DSP_TAP26 ,0x0000 ); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false); } val =tr32 (TG3_CPMU_EEE_MODE );
@@ -2264,11 +2276,11 @@ static void tg3_phy_eee_enable(struct tg3 *tp) (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || tg3_flag(tp, 57765_CLASS)) && - !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) { + !tg3_phy_toggle_auxctl_smdsp(tp, true)) { val =MII_TG3_DSP_TAP26_ALNOKO |MII_TG3_DSP_TAP26_RMRXSTO ;tg3_phydsp_write (tp,MII_TG3_DSP_TAP26 , val); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false); } val =tr32 (TG3_CPMU_EEE_MODE );
@@ -2412,7 +2424,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)tg3_writephy (tp,MII_CTRL1000 ,CTL1000_AS_MASTER |CTL1000_ENABLE_MASTER ); - err =TG3_PHY_AUXCTL_SMDSP_ENABLE (tp); + err =tg3_phy_toggle_auxctl_smdsp (tp, true);if (err)return err;
@@ -2433,7 +2445,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)tg3_writephy (tp,MII_TG3_DSP_ADDRESS ,0x8200 );tg3_writephy (tp,MII_TG3_DSP_CONTROL ,0x0000 ); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false);tg3_writephy (tp,MII_CTRL1000 , phy9_orig);
@@ -2522,10 +2534,10 @@ static int tg3_phy_reset(struct tg3 *tp) out:if ((tp->phy_flags &TG3_PHYFLG_ADC_BUG ) && - !TG3_PHY_AUXCTL_SMDSP_ENABLE (tp)) { + !tg3_phy_toggle_auxctl_smdsp (tp, true)) {tg3_phydsp_write (tp,0x201f ,0x2aaa );tg3_phydsp_write (tp,0x000a ,0x0323 ); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false); }if (tp->phy_flags &TG3_PHYFLG_5704_A0_BUG ) {
@@ -2534,14 +2546,14 @@ out: }if (tp->phy_flags &TG3_PHYFLG_BER_BUG ) { -if (!TG3_PHY_AUXCTL_SMDSP_ENABLE (tp)) { +if (!tg3_phy_toggle_auxctl_smdsp (tp, true)) {tg3_phydsp_write (tp,0x000a ,0x310b );tg3_phydsp_write (tp,0x201f ,0x9506 );tg3_phydsp_write (tp,0x401f ,0x14e2 ); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false); } }else if (tp->phy_flags &TG3_PHYFLG_JITTER_BUG ) { -if (!TG3_PHY_AUXCTL_SMDSP_ENABLE (tp)) { +if (!tg3_phy_toggle_auxctl_smdsp (tp, true)) {tg3_writephy (tp,MII_TG3_DSP_ADDRESS ,0x000a );if (tp->phy_flags &TG3_PHYFLG_ADJUST_TRIM ) {tg3_writephy (tp,MII_TG3_DSP_RW_PORT ,0x110b );
@@ -2550,7 +2562,7 @@ out: }else tg3_writephy (tp,MII_TG3_DSP_RW_PORT ,0x010b ); -TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); +tg3_phy_toggle_auxctl_smdsp (tp, false); } }
@@ -3967,7 +3979,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)tw32 (TG3_CPMU_EEE_MODE ,tr32 (TG3_CPMU_EEE_MODE ) & ~TG3_CPMU_EEEMD_LPI_ENABLE ); - err =TG3_PHY_AUXCTL_SMDSP_ENABLE (tp); + err =tg3_phy_toggle_auxctl_smdsp (tp, true);if (!err) {u32 err2;
@@ -4000,7 +4012,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl) MII_TG3_DSP_CH34TP2_HIBW01); } - err2 =TG3_PHY_AUXCTL_SMDSP_DISABLE (tp); + err2 =tg3_phy_toggle_auxctl_smdsp (tp, false);if (!err) err = err2; }
Signature · 1 line
1.7.10.4
PATCH 36/86 sunvdc: Fix off-by-one in generic_request().
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit f4d9605434c0fd4cc8639bf25cfc043418c52362 ]
The 'operations' bitmap corresponds one-for-one with the operation codes, no adjustment is necessary.
--- drivers/block/sunvdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/sunvdc.c +1 -1
@@ -461,7 +461,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len)int op_len, err;void *req_buf; -if (!(((u64 )1 << ((u64 )op -1 )) & port->operations)) +if (!(((u64 )1 << (u64 )op) & port->operations))return -EOPNOTSUPP ;switch (op) {
Signature · 1 line
1.7.10.4
PATCH 37/86 bridge: set priority of STP packets
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Stephen Hemminger <[email protected]>
[ Upstream commit 547b4e718115eea74087e28d7fa70aec619200db ]
Spanning Tree Protocol packets should have always been marked as control packets, this causes them to get queued in the high prirority FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge gets overloaded and can't communicate. This is a long-standing bug back to the first versions of Linux bridge.
--- net/bridge/br_stp_bpdu.c | 2 ++ 1 file changed, 2 insertions(+)
net/bridge/br_stp_bpdu.c +2 -0
@@ -16,6 +16,7 @@#include <linux/etherdevice.h> #include <linux/llc.h> #include <linux/slab.h> +#include <linux/pkt_sched.h> #include <net/net_namespace.h> #include <net/llc.h> #include <net/llc_pdu.h>
@@ -40,6 +41,7 @@ static void br_send_bpdu(struct net_bridge_port *p, skb->dev = p->dev; skb->protocol =htons (ETH_P_802_2 ); + skb->priority =TC_PRIO_CONTROL ;skb_reserve (skb,LLC_RESERVE );memcpy (__skb_put (skb, length), data, length);
Signature · 1 line
1.7.10.4
PATCH 38/86 net: fix infinite loop in __skb_recv_datagram()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 77c1090f94d1b0b5186fb13a1b71b47b1343f87f ]
Tommi was fuzzing with trinity and reported the following problem :
commit 3f518bf745 (datagram: Add offset argument to __skb_recv_datagram) missed that a raw socket receive queue can contain skbs with no payload.
We can loop in __skb_recv_datagram() with MSG_PEEK mode, because wait_for_packet() is not prepared to skip these skbs.
[ 83.541011] INFO: rcu_sched detected stalls on CPUs/tasks: {}
(detected by 0, t=26002 jiffies, g=27673, c=27672, q=75)
[ 83.541011] INFO: Stall ended before state dump start
[ 108.067010] BUG: soft lockup - CPU#0 stuck for 22s! [trinity-child31:2847]
...
[ 108.067010] Call Trace:
[ 108.067010] [<ffffffff818cc103>] __skb_recv_datagram+0x1a3/0x3b0
[ 108.067010] [<ffffffff818cc33d>] skb_recv_datagram+0x2d/0x30
[ 108.067010] [<ffffffff819ed43d>] rawv6_recvmsg+0xad/0x240
[ 108.067010] [<ffffffff818c4b04>] sock_common_recvmsg+0x34/0x50
[ 108.067010] [<ffffffff818bc8ec>] sock_recvmsg+0xbc/0xf0
[ 108.067010] [<ffffffff818bf31e>] sys_recvfrom+0xde/0x150
[ 108.067010] [<ffffffff81ca4329>] system_call_fastpath+0x16/0x1b--- net/core/datagram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/datagram.c +1 -1
@@ -187,7 +187,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, skb_queue_walk(queue, skb) { *peeked = skb->peeked;if (flags &MSG_PEEK ) { -if (*off >= skb->len) { +if (*off >= skb->len && skb->len) { *off -= skb->len;continue ; }
Signature · 1 line
1.7.10.4
PATCH 39/86 xen-netback: correctly return errors from netbk_count_requests()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 35876b5ffc154c357476b2c3bdab10feaf4bd8f0 ]
netbk_count_requests() could detect an error, call netbk_fatal_tx_error() but return 0. The vif may then be used afterwards (e.g., in a call to netbk_tx_error().
Since netbk_fatal_tx_error() could set vif->refcnt to 1, the vif may be freed immediately after the call to netbk_fatal_tx_error() (e.g., if the vif is also removed).
Netback thread Xenwatch thread
-------------------------------------------netbk_fatal_tx_err() netback_remove()
xenvif_disconnect()
...
free_netdev()netbk_tx_err() Oops!
--- drivers/net/xen-netback/netback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/xen-netback/netback.c +4 -4
@@ -882,13 +882,13 @@ static int netbk_count_requests(struct xenvif *vif,if (frags >= work_to_do) {netdev_err (vif->dev,"Need more frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -ENODATA ; }if (unlikely (frags >=MAX_SKB_FRAGS )) {netdev_err (vif->dev,"Too many frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -E2BIG ; } memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
@@ -896,7 +896,7 @@ static int netbk_count_requests(struct xenvif *vif,if (txp->size > first->size) {netdev_err (vif->dev,"Frag is bigger than frame.\n" );netbk_fatal_tx_err (vif); -return -frags; +return -EIO ; } first->size -= txp->size;
@@ -906,7 +906,7 @@ static int netbk_count_requests(struct xenvif *vif,netdev_err (vif->dev,"txp->offset: %x, size: %u\n" , txp->offset, txp->size);netbk_fatal_tx_err (vif); -return -frags; +return -EINVAL ; } }while ((txp++)->flags & XEN_NETTXF_more_data);return frags;
Signature · 1 line
1.7.10.4
PATCH 40/86 xen-netback: cancel the credit timer when taking the vif down
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 3e55f8b306cf305832a4ac78aa82e1b40e818ece ]
If the credit timer is left armed after calling xen_netbk_remove_xenvif(), then it may fire and attempt to schedule the vif which will then oops as vif->netbk == NULL.
This may happen both in the fatal error path and during normal disconnection from the front end.
The sequencing during shutdown is critical to ensure that: a) vif->netbk doesn't become unexpectedly NULL; and b) the net device/vif is not freed.
1. Mark as unschedulable (netif_carrier_off()).
2. Synchronously cancel the timer.
3. Remove the vif from the schedule list.
4. Remove it from it netback thread group.
5. Wait for vif->refcnt to become 0.
--- drivers/net/xen-netback/interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/xen-netback/interface.c +1 -2
@@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vif)static void xenvif_down (struct xenvif *vif) {disable_irq (vif->irq); +del_timer_sync (&vif->credit_timeout);xen_netbk_deschedule_xenvif (vif);xen_netbk_remove_xenvif (vif); }
@@ -363,8 +364,6 @@ void xenvif_disconnect(struct xenvif *vif)atomic_dec (&vif->refcnt);wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -del_timer_sync (&vif->credit_timeout); -if (vif->irq)unbind_from_irqhandler (vif->irq, vif);
Signature · 1 line
1.7.10.4
PATCH 41/86 net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ying Xue <[email protected]>
[ Upstream commit dec34fb0f5b7873de45132a84a3af29e61084a6b ]
When SOCK_REFCNT_DEBUG is enabled, below build error is met:
kernel/sysctl_binary.o: In function `sk_refcnt_debug_release':include/net/sock.h:1025: multiple definition of sk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here kernel/audit.o: In function sk_refcnt_debug_release':include/net/sock.h:1025: multiple definition of `sk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here make[1]: *** [kernel/built-in.o] Error 1
make: *** [kernel] Error 2
So we decide to make sk_refcnt_debug_release static to eliminate the error.
--- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/sock.h +1 -1
@@ -1012,7 +1012,7 @@ static inline void sk_refcnt_debug_dec(struct sock *sk) sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks)); } -inline void sk_refcnt_debug_release (const struct sock *sk) +static inline void sk_refcnt_debug_release (const struct sock *sk) {if (atomic_read (&sk->sk_refcnt) !=1 ) printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n",
Signature · 1 line
1.7.10.4
PATCH 42/86 ipv4: fix a bug in ping_err().
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Li Wei <[email protected]>
[ Upstream commit b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 ]
We should get 'type' and 'code' from the outer ICMP header.
--- net/ipv4/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/ping.c +2 -2
@@ -328,8 +328,8 @@ void ping_err(struct sk_buff *skb, u32 info)struct iphdr *iph = (struct iphdr *)skb->data;struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2 ));struct inet_sock *inet_sock; -int type = icmph->type; -int code = icmph->code; +int type =icmp_hdr (skb)->type; +int code =icmp_hdr (skb)->code;struct net *net =dev_net (skb->dev);struct sock *sk;int harderr;
Signature · 1 line
1.7.10.4
PATCH 43/86 ipv6: use a stronger hash for tcp
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664 ]
It looks like its possible to open thousands of TCP IPv6 sessions on a server, all landing in a single slot of TCP hash table. Incoming packets have to lookup sockets in a very long list.
We should hash all bits from foreign IPv6 addresses, using a salt and hash mix, not a simple XOR.
inet6_ehashfn() can also separately use the ports, instead of xoring them.
--- include/net/inet6_hashtables.h | 8 ++++---- include/net/inet_sock.h | 1 + include/net/ipv6.h | 12 ++++++++++++ net/ipv4/af_inet.c | 9 +++++++-- 4 files changed, 24 insertions(+), 6 deletions(-)
include/net/inet6_hashtables.h +4 -4
@@ -28,16 +28,16 @@struct inet_hashinfo ; -/* I have no idea if this is a good hash for v6 or not. -DaveM */ static inline unsigned int inet6_ehashfn (struct net *net,const struct in6_addr *laddr,const u16 lport,const struct in6_addr *faddr,const __be16 fport) { -u32 ports = (lport ^ (__force u16 )fport); +u32 ports = (((u32 )lport) <<16 ) | (__force u32 )fport;return jhash_3words ((__force u32 )laddr->s6_addr32[3 ], - (__force u32 )faddr->s6_addr32[3 ], - ports, inet_ehash_secret +net_hash_mix (net)); +ipv6_addr_jhash (faddr), + ports, + inet_ehash_secret +net_hash_mix (net)); }static inline int inet6_sk_ehashfn (const struct sock *sk)
include/net/inet_sock.h +1 -0
@@ -203,6 +203,7 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,extern int inet_sk_rebuild_header (struct sock *sk);extern u32 inet_ehash_secret; +extern u32 ipv6_hash_secret;extern void build_ehash_secret (void ); static inline unsigned int inet_ehashfn(struct net *net,
include/net/ipv6.h +12 -0
@@ -15,6 +15,7 @@#include <linux/ipv6.h> #include <linux/hardirq.h> +#include <linux/jhash.h> #include <net/if_inet6.h> #include <net/ndisc.h> #include <net/flow.h>
@@ -432,6 +433,17 @@ static inline u32 ipv6_addr_hash(const struct in6_addr *a)#endif } +/* more secured version of ipv6_addr_hash() */ +static inline u32 ipv6_addr_jhash (const struct in6_addr *a) +{ +u32 v = (__force u32 )a->s6_addr32[0 ] ^ (__force u32 )a->s6_addr32[1 ]; + +return jhash_3words (v, + (__force u32 )a->s6_addr32[2 ], + (__force u32 )a->s6_addr32[3 ], + ipv6_hash_secret); +} +static inline bool ipv6_addr_loopback (const struct in6_addr *a) { return (a->s6_addr32[0] | a->s6_addr32[1] |
net/ipv4/af_inet.c +7 -2
@@ -228,8 +228,12 @@ EXPORT_SYMBOL(inet_listen);u32 inet_ehash_secret__read_mostly ;EXPORT_SYMBOL (inet_ehash_secret); +u32 ipv6_hash_secret__read_mostly ; +EXPORT_SYMBOL (ipv6_hash_secret); +/* -* inet_ehash_secret must be set exactly once +* inet_ehash_secret must be set exactly once, and to a non nul value +* ipv6_hash_secret must be set exactly once. */ void build_ehash_secret (void ) {
@@ -239,7 +243,8 @@ void build_ehash_secret(void)get_random_bytes (&rnd,sizeof (rnd)); }while (rnd ==0 ); -cmpxchg (&inet_ehash_secret,0 , rnd); +if (cmpxchg (&inet_ehash_secret,0 , rnd) ==0 ) +get_random_bytes (&ipv6_hash_secret,sizeof (ipv6_hash_secret)); }EXPORT_SYMBOL (build_ehash_secret);
Signature · 1 line
1.7.10.4
PATCH 44/86 sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 ]
Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY with a family greater or equal then AF_MAX -- the array size of sock_diag_handlers[]. The current code does not test for this condition therefore is vulnerable to an out-of-bound access opening doors for a privilege escalation.
--- net/core/sock_diag.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/sock_diag.c +3 -0
@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)if (nlmsg_len (nlh) <sizeof (*req))return -EINVAL ; +if (req->sdiag_family >=AF_MAX ) +return -EINVAL ; + hndl =sock_diag_lock_handler (req->sdiag_family);if (hndl ==NULL ) err = -ENOENT ;
Signature · 1 line
1.7.10.4
PATCH 45/86 vlan: adjust vlan_set_encap_proto() for its callers
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit da8c87241c26aac81a64c7e4d21d438a33018f4e ]
There are two places to call vlan_set_encap_proto():vlan_untag() and __pop_vlan_tci().
vlan_untag() assumes skb->data points after mac addr, otherwise the following code
vhdr = (struct vlan_hdr *) skb->data;
vlan_tci = ntohs(vhdr->h_vlan_TCI);
__vlan_hwaccel_put_tag(skb, vlan_tci);
skb_pull_rcsum(skb, VLAN_HLEN);won't be correct. But __pop_vlan_tci() assumes points _before_ mac addr.
In vlan_set_encap_proto(), it looks for some magic L2 value after mac addr:
rawp = skb->data;
if (*(unsigned short *) rawp == 0xFFFF)
...Therefore __pop_vlan_tci() is obviously wrong.
A quick fix is avoiding using skb->data in vlan_set_encap_proto(), use 'vhdr+1' is always correct in both cases.
--- include/linux/if_vlan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/if_vlan.h +3 -3
@@ -327,7 +327,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb, struct vlan_hdr *vhdr) {__be16 proto; -unsigned char *rawp; +unsigned short *rawp;/* * Was a VLAN packet, grab the encapsulated protocol, which the layer
@@ -340,8 +340,8 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,return ; } - rawp = skb->data; -if (*(unsigned short *) rawp ==0xFFFF ) + rawp = (unsigned short *)(vhdr +1 ); +if (*rawp ==0xFFFF )/* * This is a magic hack to spot IPX packets. Older Novell * breaks the protocol design and runs IPX over 802.3 without
Signature · 1 line
1.7.10.4
PATCH 46/86 l2tp: Restore socket refcount when sendmsg succeeds
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Guillaume Nault <[email protected]>
[ Upstream commit 8b82547e33e85fc24d4d172a93c796de1fefa81a ]
The sendmsg() syscall handler for PPPoL2TP doesn't decrease the socket reference counter after successful transmissions. Any successful sendmsg() call from userspace will then increase the reference counter forever, thus preventing the kernel's session and tunnel data from being freed later on.
The problem only happens when writing directly on L2TP sockets. PPP sockets attached to L2TP are unaffected as the PPP subsystem uses pppol2tp_xmit() which symmetrically increase/decrease reference counters.
This patch adds the missing call to sock_put() before returning from pppol2tp_sendmsg().
--- net/l2tp/l2tp_ppp.c | 1 + 1 file changed, 1 insertion(+)
net/l2tp/l2tp_ppp.c +1 -0
@@ -355,6 +355,7 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghl2tp_xmit_skb (session, skb, session->hdr_len);sock_put (ps->tunnel_sock); +sock_put (sk);return error;
Signature · 1 line
1.7.10.4
PATCH 47/86 rds: limit the size allocated by rds_message_alloc()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit ece6b0a2b25652d684a7ced4ae680a863af041e0 ]
Dave Jones reported the following bug:
"When fed mangled socket data, rds will trust what userspace gives it, and tries to allocate enormous amounts of memory larger than what kmalloc can satisfy."
WARNING: at mm/page_alloc.c:2393 __alloc_pages_nodemask+0xa0d/0xbe0() Hardware name: GA-MA78GM-S2H Modules linked in: vmw_vsock_vmci_transport vmw_vmci vsock fuse bnep dlci bridge 8021q garp stp mrp binfmt_misc l2tp_ppp l2tp_core rfcomm s Pid: 24652, comm: trinity-child2 Not tainted 3.8.0+ #65 Call Trace: [<ffffffff81044155>] warn_slowpath_common+0x75/0xa0 [<ffffffff8104419a>] warn_slowpath_null+0x1a/0x20 [<ffffffff811444ad>] __alloc_pages_nodemask+0xa0d/0xbe0 [<ffffffff8100a196>] ? native_sched_clock+0x26/0x90 [<ffffffff810b2128>] ? trace_hardirqs_off_caller+0x28/0xc0 [<ffffffff810b21cd>] ? trace_hardirqs_off+0xd/0x10 [<ffffffff811861f8>] alloc_pages_current+0xb8/0x180 [<ffffffff8113eaaa>] __get_free_pages+0x2a/0x80 [<ffffffff811934fe>] kmalloc_order_trace+0x3e/0x1a0 [<ffffffff81193955>] __kmalloc+0x2f5/0x3a0 [<ffffffff8104df0c>] ? local_bh_enable_ip+0x7c/0xf0 [<ffffffffa0401ab3>] rds_message_alloc+0x23/0xb0 [rds] [<ffffffffa04043a1>] rds_sendmsg+0x2b1/0x990 [rds] [<ffffffff810b21cd>] ? trace_hardirqs_off+0xd/0x10 [<ffffffff81564620>] sock_sendmsg+0xb0/0xe0 [<ffffffff810b2052>] ? get_lock_stats+0x22/0x70 [<ffffffff810b24be>] ? put_lock_stats.isra.23+0xe/0x40 [<ffffffff81567f30>] sys_sendto+0x130/0x180 [<ffffffff810b872d>] ? trace_hardirqs_on+0xd/0x10 [<ffffffff816c547b>] ? _raw_spin_unlock_irq+0x3b/0x60 [<ffffffff816cd767>] ? sysret_check+0x1b/0x56 [<ffffffff810b8695>] ? trace_hardirqs_on_caller+0x115/0x1a0 [<ffffffff81341d8e>] ? trace_hardirqs_on_thunk+0x3a/0x3f [<ffffffff816cd742>] system_call_fastpath+0x16/0x1b ---[ end trace eed6ae990d018c8b ]---
--- net/rds/message.c | 3 +++ 1 file changed, 3 insertions(+)
net/rds/message.c +3 -0
@@ -197,6 +197,9 @@ struct rds_message *rds_message_alloc(unsigned int extra_len, gfp_t gfp) {struct rds_message *rm; +if (extra_len >KMALLOC_MAX_SIZE -sizeof (struct rds_message )) +return NULL ; + rm =kzalloc (sizeof (struct rds_message ) + extra_len, gfp);if (!rm) goto out;
Signature · 1 line
1.7.10.4
PATCH 48/86 net: ipv6: Dont purge default router if accept_ra=2
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Lorenzo Colitti <[email protected]>
[ Upstream commit 3e8b0ac3e41e3c882222a5522d5df7212438ab51 ]
Setting net.ipv6.conf.<interface>.accept_ra=2 causes the kernel to accept RAs even when forwarding is enabled. However, enabling forwarding purges all default routes on the system, breaking connectivity until the next RA is received. Fix this by not purging default routes on interfaces that have accept_ra=2.
--- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/route.c +2 -1
@@ -1943,7 +1943,8 @@ void rt6_purge_dflt_routers(struct net *net) restart:read_lock_bh (&table->tb6_lock);for (rt = table->tb6_root.leaf; rt; rt = rt->dst.rt6_next) { -if (rt->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF )) { +if (rt->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF ) && + (!rt->rt6i_idev || rt->rt6i_idev->cnf.accept_ra !=2 )) {dst_hold (&rt->dst);read_unlock_bh (&table->tb6_lock);ip6_del_rt (rt);
Signature · 1 line
1.7.10.4
PATCH 49/86 tcp: fix double-counted receiver RTT when leaving receiver fast path
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Upstream commit aab2b4bf224ef8358d262f95b568b8ad0cecf0a0 ]
We should not update ts_recent and call tcp_rcv_rtt_measure_ts() both before and after going to step5. That wastes CPU and double-counts the receiver-side RTT sample.
--- net/ipv4/tcp_input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv4/tcp_input.c +3 -3
@@ -5525,6 +5525,9 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,if (tcp_checksum_complete_user (sk, skb)) goto csum_error; +if ((int )skb->truesize > sk->sk_forward_alloc) + goto step5; +/* Predicted packet is in window by definition. * seq == rcv_nxt and rcv_wup <= rcv_nxt. * Hence, check seq<=rcv_wup reduces to:
@@ -5536,9 +5539,6 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,tcp_rcv_rtt_measure_ts (sk, skb); -if ((int )skb->truesize > sk->sk_forward_alloc) - goto step5; -NET_INC_STATS_BH (sock_net (sk),LINUX_MIB_TCPHPHITS );/* Bulk data transfer: receiver */
Signature · 1 line
1.7.10.4
PATCH 50/86 tun: add a missing nf_reset() in tun_net_xmit()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit f8af75f3517a24838a36eb5797a1a3e60bf9e276 ]
Dave reported following crash :
general protection fault: 0000 [#1] SMP CPU 2 Pid: 25407, comm: qemu-kvm Not tainted 3.7.9-205.fc18.x86_64 #1 Hewlett-Packard HP Z400 Workstation/0B4Ch RIP: 0010:[<ffffffffa0399bd5>] [<ffffffffa0399bd5>] destroy_conntrack+0x35/0x120 [nf_conntrack] RSP: 0018:ffff880276913d78 EFLAGS: 00010206 RAX: 50626b6b7876376c RBX: ffff88026e530d68 RCX: ffff88028d158e00 RDX: ffff88026d0d5470 RSI: 0000000000000011 RDI: 0000000000000002 RBP: ffff880276913d88 R08: 0000000000000000 R09: ffff880295002900 R10: 0000000000000000 R11: 0000000000000003 R12: ffffffff81ca3b40 R13: ffffffff8151a8e0 R14: ffff880270875000 R15: 0000000000000002 FS: 00007ff3bce38a00(0000) GS:ffff88029fc40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 00007fd1430bd000 CR3: 000000027042b000 CR4: 00000000000027e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process qemu-kvm (pid: 25407, threadinfo ffff880276912000, task ffff88028c369720) Stack: ffff880156f59100 ffff880156f59100 ffff880276913d98 ffffffff815534f7 ffff880276913db8 ffffffff8151a74b ffff880270875000 ffff880156f59100 ffff880276913dd8 ffffffff8151a5a6 ffff880276913dd8 ffff88026d0d5470 Call Trace: [<ffffffff815534f7>] nf_conntrack_destroy+0x17/0x20 [<ffffffff8151a74b>] skb_release_head_state+0x7b/0x100 [<ffffffff8151a5a6>] __kfree_skb+0x16/0xa0 [<ffffffff8151a666>] kfree_skb+0x36/0xa0 [<ffffffff8151a8e0>] skb_queue_purge+0x20/0x40 [<ffffffffa02205f7>] __tun_detach+0x117/0x140 [tun] [<ffffffffa022184c>] tun_chr_close+0x3c/0xd0 [tun] [<ffffffff8119669c>] __fput+0xec/0x240 [<ffffffff811967fe>] ____fput+0xe/0x10 [<ffffffff8107eb27>] task_work_run+0xa7/0xe0 [<ffffffff810149e1>] do_notify_resume+0x71/0xb0 [<ffffffff81640152>] int_signal+0x12/0x17 Code: 00 00 04 48 89 e5 41 54 53 48 89 fb 4c 8b a7 e8 00 00 00 0f 85 de 00 00 00 0f b6 73 3e 0f b7 7b 2a e8 10 40 00 00 48 85 c0 74 0e <48> 8b 40 28 48 85 c0 74 05 48 89 df ff d0 48 c7 c7 08 6a 3a a0 RIP [<ffffffffa0399bd5>] destroy_conntrack+0x35/0x120 [nf_conntrack] RSP <ffff880276913d78>
This is because tun_net_xmit() needs to call nf_reset() before queuing skb into receive_queue
--- drivers/net/tun.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/tun.c +2 -0
@@ -421,6 +421,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) goto drop;skb_orphan (skb); +nf_reset (skb); +/* Enqueue packet */ skb_queue_tail (&tun->socket.sk->sk_receive_queue, skb);
Signature · 1 line
1.7.10.4
PATCH 51/86 macvlan: Set IFF_UNICAST_FLT flag to prevent unnecessary promisc mode.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Vlad Yasevich <[email protected]>
[ Upstream commit 87ab7f6f2874f1115817e394a7ed2dea1c72549e ]
Macvlan already supports hw address filters. Set the IFF_UNICAST_FLT so that it doesn't needlesly enter PROMISC mode when macvlans are stacked.
--- drivers/net/macvlan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/macvlan.c +1 -0
@@ -628,6 +628,7 @@ void macvlan_common_setup(struct net_device *dev)ether_setup (dev); dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE |IFF_TX_SKB_SHARING ); + dev->priv_flags |=IFF_UNICAST_FLT ; dev->netdev_ops = &macvlan_netdev_ops; dev->destructor = free_netdev; dev->header_ops = &macvlan_hard_header_ops,
Signature · 1 line
1.7.10.4
PATCH 52/86 netlabel: fix build problems when CONFIG_IPV6=n
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
[ Upstream commit a6a8fe950e1b8596bb06f2c89c3a1a4bf2011ba9 ]
My last patch to solve a problem where the static/fallback labels were not fully displayed resulted in build problems when IPv6 was disabled. This patch resolves the IPv6 build problems; sorry for the screw-up.
Please queue for -stable or simply merge with the previous patch.
--- net/netlabel/netlabel_unlabeled.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
net/netlabel/netlabel_unlabeled.c +5 -10
@@ -1189,8 +1189,6 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb,struct netlbl_unlhsh_walk_arg cb_arg;u32 skip_bkt = cb->args[0 ];u32 skip_chain = cb->args[1 ]; -u32 skip_addr4 = cb->args[2 ]; -u32 skip_addr6 = cb->args[3 ];u32 iter_bkt;u32 iter_chain =0 , iter_addr4 =0 , iter_addr6 =0 ;struct netlbl_unlhsh_iface *iface;
@@ -1215,7 +1213,7 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb,continue ;netlbl_af4list_foreach_rcu (addr4, &iface->addr4_list) { -if (iter_addr4++ < skip_addr4) +if (iter_addr4++ < cb->args[2 ])continue ; if (netlbl_unlabel_staticlist_gen( NLBL_UNLABEL_C_STATICLIST,
@@ -1231,7 +1229,7 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb,#if IS_ENABLED (CONFIG_IPV6 )netlbl_af6list_foreach_rcu (addr6, &iface->addr6_list) { -if (iter_addr6++ < skip_addr6) +if (iter_addr6++ < cb->args[3 ])continue ; if (netlbl_unlabel_staticlist_gen( NLBL_UNLABEL_C_STATICLIST,
@@ -1273,12 +1271,9 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, {struct netlbl_unlhsh_walk_arg cb_arg;struct netlbl_unlhsh_iface *iface; -u32 skip_addr4 = cb->args[0 ]; -u32 skip_addr6 = cb->args[1 ]; -u32 iter_addr4 =0 ; +u32 iter_addr4 =0 , iter_addr6 =0 ;struct netlbl_af4list *addr4;#if IS_ENABLED (CONFIG_IPV6 ) -u32 iter_addr6 =0 ;struct netlbl_af6list *addr6;#endif
@@ -1292,7 +1287,7 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, goto unlabel_staticlistdef_return; netlbl_af4list_foreach_rcu(addr4, &iface->addr4_list) { -if (iter_addr4++ < skip_addr4) +if (iter_addr4++ < cb->args[0 ])continue ; if (netlbl_unlabel_staticlist_gen(NLBL_UNLABEL_C_STATICLISTDEF, iface,
@@ -1305,7 +1300,7 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, }#if IS_ENABLED (CONFIG_IPV6 ) netlbl_af6list_foreach_rcu(addr6, &iface->addr6_list) { -if (iter_addr6++ < skip_addr6) +if (iter_addr6++ < cb->args[1 ])continue ; if (netlbl_unlabel_staticlist_gen(NLBL_UNLABEL_C_STATICLISTDEF, iface,
Signature · 1 line
1.7.10.4
PATCH 53/86 netlabel: correctly list all the static label mappings
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Paul Moore <[email protected]>
[ Upstream commit 0c1233aba1e948c37f6dc7620cb7c253fcd71ce9 ]
When we have a large number of static label mappings that spill across the netlink message boundary we fail to properly save our state in the netlink_callback struct which causes us to repeat the same listings. This patch fixes this problem by saving the state correctly between calls to the NetLabel static label netlink "dumpit" routines.
--- net/netlabel/netlabel_unlabeled.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/netlabel/netlabel_unlabeled.c +6 -6
@@ -1248,10 +1248,10 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb, unlabel_staticlist_return:rcu_read_unlock (); - cb->args[0 ] = skip_bkt; - cb->args[1 ] = skip_chain; - cb->args[2 ] = skip_addr4; - cb->args[3 ] = skip_addr6; + cb->args[0 ] = iter_bkt; + cb->args[1 ] = iter_chain; + cb->args[2 ] = iter_addr4; + cb->args[3 ] = iter_addr6;return skb->len; }
@@ -1315,8 +1315,8 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, unlabel_staticlistdef_return:rcu_read_unlock (); - cb->args[0 ] = skip_addr4; - cb->args[1 ] = skip_addr6; + cb->args[0 ] = iter_addr4; + cb->args[1 ] = iter_addr6;return skb->len; }
Signature · 1 line
1.7.10.4
PATCH 54/86 bridging: fix rx_handlers return code
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Cristian Bercaru <[email protected]>
[ Upstream commit 3bc1b1add7a8484cc4a261c3e128dbe1528ce01f ]
The frames for which rx_handlers return RX_HANDLER_CONSUMED are no longer counted as dropped. They are counted as successfully received by 'netif_receive_skb'.
This allows network interface drivers to correctly update their RX-OK and RX-DRP counters based on the result of 'netif_receive_skb'.
--- net/core/dev.c | 1 + 1 file changed, 1 insertion(+)
net/core/dev.c +1 -0
@@ -3296,6 +3296,7 @@ ncls: }switch (rx_handler (&skb)) {case RX_HANDLER_CONSUMED : + ret =NET_RX_SUCCESS ; goto unlock;case RX_HANDLER_ANOTHER : goto another_round;
Signature · 1 line
1.7.10.4
PATCH 55/86 ipv6: stop multicast forwarding to process interface scoped addresses
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit ddf64354af4a702ee0b85d0a285ba74c7278a460 ]
v2:
a) used struct ipv6_addr_props
v3:
a) reverted changes for ipv6_addr_props
v4:
a) do not use __ipv6_addr_needs_scope_id
--- net/ipv6/ip6_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/ip6_input.c +2 -1
@@ -270,7 +270,8 @@ int ip6_mc_input(struct sk_buff *skb)* IPv6 multicast router mode is now supported ;) */ if (dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding && - !(ipv6_addr_type (&hdr->daddr) &IPV6_ADDR_LINKLOCAL ) && + !(ipv6_addr_type (&hdr->daddr) & + (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL )) &&likely (!(IP6CB (skb)->flags &IP6SKB_FORWARDED ))) {/* * Okay, we try to forward - split and duplicate
Signature · 1 line
1.7.10.4
PATCH 56/86 rtnl: fix info leak on RTM_GETLINK request for VF devices
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit 84d73cd3fb142bf1298a8c13fd4ca50fd2432372 ]
Initialize the mac address buffer with 0 as the driver specific function will probably not fill the whole buffer. In fact, all in-kernel drivers fill only ETH_ALEN of the MAX_ADDR_LEN bytes, i.e. 6 of the 32 possible bytes. Therefore we currently leak 26 bytes of stack memory to userland via the netlink interface.
--- net/core/rtnetlink.c | 1 + 1 file changed, 1 insertion(+)
net/core/rtnetlink.c +1 -0
@@ -976,6 +976,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,* report anything. */ ivi.spoofchk =-1 ; +memset (ivi.mac,0 ,sizeof (ivi.mac));if (dev->netdev_ops->ndo_get_vf_config (dev, i, &ivi))break ; vf_mac.vf =
Signature · 1 line
1.7.10.4
PATCH 57/86 dcbnl: fix various netlink info leaks
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit 29cd8ae0e1a39e239a3a7b67da1986add1199fc0 ]
The dcb netlink interface leaks stack memory in various places:
* perm_addr[] buffer is only filled at max with 12 of the 32 bytes but copied completely,
* no in-kernel driver fills all fields of an IEEE 802.1Qaz subcommand, so we're leaking up to 58 bytes for ieee_ets structs, up to 136 bytes for ieee_pfc structs, etc.,
* the same is true for CEE -- no in-kernel driver fills the whole struct,
Prevent all of the above stack info leaks by properly initializing the buffers/structures involved.
--- net/dcb/dcbnl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/dcb/dcbnl.c +8 -0
@@ -284,6 +284,7 @@ static int dcbnl_getperm_hwaddr(struct net_device *netdev, struct nlmsghdr *nlh,if (!netdev->dcbnl_ops->getpermhwaddr)return -EOPNOTSUPP ; +memset (perm_addr,0 ,sizeof (perm_addr)); netdev->dcbnl_ops->getpermhwaddr (netdev, perm_addr);return nla_put (skb,DCB_ATTR_PERM_HWADDR ,sizeof (perm_addr), perm_addr);
@@ -1042,6 +1043,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)if (ops->ieee_getets) {struct ieee_ets ets; +memset (&ets,0 ,sizeof (ets)); err = ops->ieee_getets (netdev, &ets);if (!err &&nla_put (skb,DCB_ATTR_IEEE_ETS ,sizeof (ets), &ets))
@@ -1050,6 +1052,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)if (ops->ieee_getmaxrate) {struct ieee_maxrate maxrate; +memset (&maxrate,0 ,sizeof (maxrate)); err = ops->ieee_getmaxrate (netdev, &maxrate);if (!err) { err = nla_put(skb, DCB_ATTR_IEEE_MAXRATE,
@@ -1061,6 +1064,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)if (ops->ieee_getpfc) {struct ieee_pfc pfc; +memset (&pfc,0 ,sizeof (pfc)); err = ops->ieee_getpfc (netdev, &pfc);if (!err &&nla_put (skb,DCB_ATTR_IEEE_PFC ,sizeof (pfc), &pfc))
@@ -1094,6 +1098,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)/* get peer info if available */ if (ops->ieee_peer_getets) {struct ieee_ets ets; +memset (&ets,0 ,sizeof (ets)); err = ops->ieee_peer_getets (netdev, &ets);if (!err &&nla_put (skb,DCB_ATTR_IEEE_PEER_ETS ,sizeof (ets), &ets))
@@ -1102,6 +1107,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)if (ops->ieee_peer_getpfc) {struct ieee_pfc pfc; +memset (&pfc,0 ,sizeof (pfc)); err = ops->ieee_peer_getpfc (netdev, &pfc);if (!err &&nla_put (skb,DCB_ATTR_IEEE_PEER_PFC ,sizeof (pfc), &pfc))
@@ -1280,6 +1286,7 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)/* peer info if available */ if (ops->cee_peer_getpg) {struct cee_pg pg; +memset (&pg,0 ,sizeof (pg)); err = ops->cee_peer_getpg (netdev, &pg);if (!err &&nla_put (skb,DCB_ATTR_CEE_PEER_PG ,sizeof (pg), &pg))
@@ -1288,6 +1295,7 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)if (ops->cee_peer_getpfc) {struct cee_pfc pfc; +memset (&pfc,0 ,sizeof (pfc)); err = ops->cee_peer_getpfc (netdev, &pfc);if (!err &&nla_put (skb,DCB_ATTR_CEE_PEER_PFC ,sizeof (pfc), &pfc))
Signature · 1 line
1.7.10.4
PATCH 58/86 6lowpan: Fix endianness issue in is_addr_link_local().
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
[ Upstream commit 9026c4927254f5bea695cc3ef2e255280e6a3011 ]
--- net/ieee802154/6lowpan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ieee802154/6lowpan.h +1 -1
@@ -84,7 +84,7 @@ (memcmp (addr1, addr2, length >>3 ) ==0 ) /* local link, i.e. FE80::/10 */ -#define is_addr_link_local (a) (((a)->s6_addr16[0]) == 0x80FE) +#define is_addr_link_local (a) (((a)->s6_addr16[0]) == htons(0xFE80))/* * check whether we can compress the IID to 16 bits,
Signature · 1 line
1.7.10.4
PATCH 59/86 ipv6: Change skb->data before using icmpv6_notify() to propagate redirect
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Duan Jiong <[email protected]>
[ Upstream commit 7801a085efab5f1d7cc54fa1f80b0c69b457db68 ]
In function ndisc_redirect_rcv(), the skb->data points to the transport header, but function icmpv6_notify() need the skb->data points to the inner IP packet. So before using icmpv6_notify() to propagate redirect, change skb->data to point the inner IP packet that triggered the sending of the Redirect, and introduce struct rd_msg to make it easy.
--- include/net/ndisc.h | 7 +++++++ net/ipv6/ndisc.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+)
include/net/ndisc.h +7 -0
@@ -77,6 +77,13 @@ struct ra_msg {__be32 retrans_timer; }; +struct rd_msg { +struct icmp6hdr icmph; +struct in6_addr target; +struct in6_addr dest; +__u8 opt[0 ]; +}; +struct nd_opt_hdr {__u8 nd_opt_type;__u8 nd_opt_len;
net/ipv6/ndisc.c +17 -0
@@ -1333,6 +1333,12 @@ out:static void ndisc_redirect_rcv (struct sk_buff *skb) { +u8 *hdr; +struct ndisc_options ndopts; +struct rd_msg *msg = (struct rd_msg *)skb_transport_header (skb); +u32 ndoptlen = skb->tail - (skb->transport_header + + offsetof(struct rd_msg , opt)); +#ifdef CONFIG_IPV6_NDISC_NODETYPE switch (skb->ndisc_nodetype) {case NDISC_NODETYPE_HOST :
@@ -1349,6 +1355,17 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)return ; } +if (!ndisc_parse_options (msg->opt, ndoptlen, &ndopts)) +return ; + +if (!ndopts.nd_opts_rh) +return ; + + hdr = (u8 *)ndopts.nd_opts_rh; + hdr +=8 ; +if (!pskb_pull (skb, hdr -skb_transport_header (skb))) +return ; +icmpv6_notify (skb,NDISC_REDIRECT ,0 ,0 ); }
Signature · 1 line
1.7.10.4
PATCH 60/86 mac802154: fix NOHZ local_softirq_pending 08 warning
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Alexander Aring <[email protected]>
[ Upstream commit 386de15c3f62bf100b4e162c0a859785d2d58661 ]
When using nanosleep() in an userspace application we get a ratelimit warning
NOHZ: local_softirq_pending 08
for 10 times.
This patch replaces netif_rx() with netif_rx_ni() which has to be used from process/softirq context.
The process/softirq context will be called from fakelb driver.
See linux-kernel commit 481a819 for similar fix.
--- net/mac802154/wpan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac802154/wpan.c +1 -1
@@ -387,7 +387,7 @@ void mac802154_wpan_setup(struct net_device *dev)static int mac802154_process_data (struct net_device *dev,struct sk_buff *skb) { -return netif_rx (skb); +return netif_rx_ni (skb); } static int
Signature · 1 line
1.7.10.4
PATCH 61/86 sctp: jsctp_sf_eat_sack: fix jprobes function signature mismatch
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit c5b1825fa547eb475ca8936f6f346c18b1ece298 ]
Commit 24cb81a6a (sctp: Push struct net down into all of the state machine functions) introduced the net structure into all state machine functions, but jsctp_sf_eat_sack was not updated, hence when SCTP association probing is enabled in the kernel, any simple SCTP client/server program from userspace will panic the kernel.
--- net/sctp/probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sctp/probe.c +2 -1
@@ -122,7 +122,8 @@ static const struct file_operations sctpprobe_fops = { .llseek = noop_llseek, }; -sctp_disposition_t jsctp_sf_eat_sack(const struct sctp_endpoint *ep, +sctp_disposition_t jsctp_sf_eat_sack(struct net *net, + const struct sctp_endpoint *ep, const struct sctp_association *asoc, const sctp_subtype_t type, void *arg,
Signature · 1 line
1.7.10.4
PATCH 62/86 macvlan: fix macvlan_get_size()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ee19a438d8f4f7ff5a9469a2f30bba7bb15f00ec ]
commit df8ef8f3aaa (macvlan: add FDB bridge ops and macvlan flags) forgot to update macvlan_get_size() after the addition of IFLA_MACVLAN_FLAGS
--- drivers/net/macvlan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/macvlan.c +4 -1
@@ -823,7 +823,10 @@ static int macvlan_changelink(struct net_device *dev,static size_t macvlan_get_size (const struct net_device *dev) { -return nla_total_size (4 ); +return (0 + +nla_total_size (4 )/* IFLA_MACVLAN_MODE */ + +nla_total_size (2 )/* IFLA_MACVLAN_FLAGS */ + ); } static int macvlan_fill_info(struct sk_buff *skb,
Signature · 1 line
1.7.10.4
PATCH 63/86 tcp: fix incorrect LOCKDROPPEDICMPS counter
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 55ef74760190fb39eacaaee1816dfaeeadd5b92d ]
commit 563d34d057 (tcp: dont drop MTU reduction indications) added an error leading to incorrect accounting of LINUX_MIB_LOCKDROPPEDICMPS
If socket is owned by the user, we want to increment this SNMP counter, unless the message is a (ICMP_DEST_UNREACH,ICMP_FRAG_NEEDED) one.
--- net/ipv4/tcp_ipv4.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/ipv4/tcp_ipv4.c +4 -5
@@ -379,11 +379,10 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info)* We do take care of PMTU discovery (RFC1191) special case : * we can receive locally generated ICMP messages while socket is held. */ -if (sock_owned_by_user (sk) && - type !=ICMP_DEST_UNREACH && - code !=ICMP_FRAG_NEEDED ) -NET_INC_STATS_BH (net,LINUX_MIB_LOCKDROPPEDICMPS ); - +if (sock_owned_by_user (sk)) { +if (!(type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED )) +NET_INC_STATS_BH (net,LINUX_MIB_LOCKDROPPEDICMPS ); + }if (sk->sk_state ==TCP_CLOSE ) goto out;
Signature · 1 line
1.7.10.4
PATCH 64/86 IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Pravin B Shelar <[email protected]>
[ Upstream commit d0a7cc630a337b0f56dc145e7eb6232852b14dd4 ]
Due to IP_GRE GSO support, GRE can recieve non linear skb which results in panic in case of GRE_CSUM. Following patch fixes it by using correct csum API.
Bug introduced in commit 6b78f16e4bdde3936b (gre: add GSO support)
--- net/ipv4/ip_gre.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/ipv4/ip_gre.c +5 -1
@@ -946,8 +946,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev ptr--; }if (tunnel->parms.o_flags&GRE_CSUM ) { +int offset =skb_transport_offset (skb); + *ptr =0 ; - *(__sum16 *)ptr =ip_compute_csum ((void *)(iph+1 ), skb->len -sizeof (struct iphdr )); + *(__sum16 *)ptr =csum_fold (skb_checksum (skb, offset, + skb->len - offset, +0 )); } }
Signature · 1 line
1.7.10.4
Re: [PATCH 64/86] IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
Quoted 7 lines · Steven Rostedt
3.6.11.1 stable review patch.
If anyone has any objections, please let me know.------------------
From: Pravin B Shelar <[email protected]>
Quoted 7 lines
[ Upstream commit
d0a7cc630a337b0f56dc145e7eb6232852b14dd4]Due to
IP_GREGSO support, GRE can recieve non linear skb which results in panic in case ofGRE_CSUM. Following patch fixes it by using correct csum API.Bug introduced in commit
6b78f16e4bdde3936b(gre: add GSO support)
That commit went into 3.7, so I don't think this fix is needed for 3.6.
Ben.
Quoted 25 lines
Signed-off-by Pravin B Shelar <[email protected]>Acked-by Eric Dumazet <[email protected]>Signed-off-by David S. Miller <[email protected]>--- net/ipv4/ip_gre.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)net/ipv4/ip_gre.c +5
-1@@ -946,8 +946,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev ptr--; }if (tunnel->parms.o_flags&GRE_CSUM ) { +int offset =skb_transport_offset (skb); + *ptr =0 ; - *(__sum16 *)ptr =ip_compute_csum ((void *)(iph+1 ), skb->len -sizeof (struct iphdr )); + *(__sum16 *)ptr =csum_fold (skb_checksum (skb, offset, + skb->len - offset, +0 )); } }
Signature · 2 lines
Ben Hutchings I'm not a reverse psychological virus. Please don't copy me into your sig.
Re: [PATCH 64/86] IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
Quoted 11 lines · Ben Hutchings
Quoted 9 lines · Steven Rostedt
3.6.11.1 stable review patch.
If anyone has any objections, please let me know.------------------
From: Pravin B Shelar <[email protected]>
[ Upstream commit
d0a7cc630a337b0f56dc145e7eb6232852b14dd4]
Quoted 7 lines
Quoted 5 lines
Due to
IP_GREGSO support, GRE can recieve non linear skb which results in panic in case ofGRE_CSUM. Following patch fixes it by using correct csum API.Bug introduced in commit
6b78f16e4bdde3936b(gre: add GSO support)That commit went into 3.7, so I don't think this fix is needed for 3.6.
Ah, you're saying that because 6b78f16e4bdde3936b wasn't in 3.6, this isn't needed for 3.6 either.
I created scripts to find the commits that made it into 3.7 and 3.8 that were not added to 3.6 and just cherry-picked them. Unless they failed because of a conflict, I really didn't look hard at them.
Thanks, I guess I can remove this change then.
-- Steve
Quoted 29 lines
Ben.
Quoted 25 lines
Signed-off-by Pravin B Shelar <[email protected]>Acked-by Eric Dumazet <[email protected]>Signed-off-by David S. Miller <[email protected]>--- net/ipv4/ip_gre.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)net/ipv4/ip_gre.c +5
-1@@ -946,8 +946,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev ptr--; }if (tunnel->parms.o_flags&GRE_CSUM ) { +int offset =skb_transport_offset (skb); + *ptr =0 ; - *(__sum16 *)ptr =ip_compute_csum ((void *)(iph+1 ), skb->len -sizeof (struct iphdr )); + *(__sum16 *)ptr =csum_fold (skb_checksum (skb, offset, + skb->len - offset, +0 )); } }
PATCH 65/86 ipv4: Remove output route check in ipv4_mtu
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 34f48df8ec531943ca83ea994eb2561897d8f9f4 ]
The output route check was introduced with git commit 261663b0 (ipv4: Don't use the cached pmtu informations for input routes) during times when we cached the pmtu informations on the inetpeer. Now the pmtu informations are back in the routes, so this check is obsolete. It also had some unwanted side effects, as reported by Timo Teras and Lukas Tribus.
--- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/route.c +1 -1
@@ -1123,7 +1123,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)if (!mtu) mtu =dst_metric_raw (dst,RTAX_MTU ); -if (mtu &&rt_is_output_route (rt)) +if (mtu)return mtu; mtu = dst->dev->mtu;
Signature · 1 line
1.7.10.4
PATCH 66/86 ipv4: Dont update the pmtu on mtu locked routes
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 4ac7bed1ff5f935525a8c71c347bbc8cdff9e067 ]
Routes with locked mtu should not use learned pmtu informations, so do not update the pmtu on these routes.
--- net/ipv4/route.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv4/route.c +3 -0
@@ -912,6 +912,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)struct dst_entry *dst = &rt->dst;struct fib_result res; +if (dst_metric_locked (dst,RTAX_MTU )) +return ; +if (dst->dev->mtu < mtu)return ;
Signature · 1 line
1.7.10.4
PATCH 67/86 ipv6: Add an error handler for icmp6
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit cdd6baf1fd9159d9b333938f1717e7c4cba025cc ]
pmtu and redirect events are now handled in the protocols error handler, so add an error handler for icmp6 to do this. It is needed in the case when we have no socket context. Based on a patch by Duan Jiong.
--- net/ipv6/icmp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
net/ipv6/icmp.c +12 -0
@@ -81,10 +81,22 @@ static inline struct sock *icmpv6_sk(struct net *net)return net->ipv6.icmp_sk[smp_processor_id ()]; } +static void icmpv6_err (struct sk_buff *skb,struct inet6_skb_parm *opt, +u8 type,u8 code,int offset,__be32 info) +{ +struct net *net =dev_net (skb->dev); + +if (type ==ICMPV6_PKT_TOOBIG ) +ip6_update_pmtu (skb, net, info,0 ,0 ); +else if (type ==NDISC_REDIRECT ) +ip6_redirect (skb, net,0 ,0 ); +} +static int icmpv6_rcv (struct sk_buff *skb);static const struct inet6_protocol icmpv6_protocol = { .handler = icmpv6_rcv, + .err_handler = icmpv6_err, .flags =INET6_PROTO_NOPOLICY |INET6_PROTO_FINAL , };
Signature · 1 line
1.7.10.4
PATCH 68/86 ipv4: Invalidate the socket cached route on pmtu events if possible
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit c82d543a2e8727233337c6f93ba7a1bddd5228cc ]
The route lookup in ipv4_sk_update_pmtu() might return a route different from the route we cached at the socket. This is because standart routes are per cpu, so each cpu has it's own struct rtable. This means that we do not invalidate the socket cached route if the NET_RX_SOFTIRQ is not served by the same cpu that the sending socket uses. As a result, the cached route reused until we disconnect.
With this patch we invalidate the socket cached route if possible. If the socket is owened by the user, we can't update the cached route directly. A followup patch will implement socket release callback functions for datagram sockets to handle this case.
--- net/ipv4/route.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
net/ipv4/route.c +41 -1
@@ -965,7 +965,7 @@ void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, }EXPORT_SYMBOL_GPL (ipv4_update_pmtu); -void ipv4_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,u32 mtu) +static void __ipv4_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,u32 mtu) {const struct iphdr *iph = (const struct iphdr *) skb->data;struct flowi4 fl4;
@@ -978,6 +978,46 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)ip_rt_put (rt); } } + +void ipv4_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,u32 mtu) +{ +const struct iphdr *iph = (const struct iphdr *) skb->data; +struct flowi4 fl4; +struct rtable *rt; +struct dst_entry *dst; + +bh_lock_sock (sk); + rt = (struct rtable *)__sk_dst_get (sk); + +if (sock_owned_by_user (sk) || !rt) { +__ipv4_sk_update_pmtu (skb, sk, mtu); + goto out; + } + +__build_flow_key (&fl4, sk, iph,0 ,0 ,0 ,0 ,0 ); + +if (!__sk_dst_check (sk,0 )) { + rt =ip_route_output_flow (sock_net (sk), &fl4, sk); +if (IS_ERR (rt)) + goto out; + } + +__ip_rt_update_pmtu ((struct rtable *) rt->dst.path, &fl4, mtu); + + dst =dst_check (&rt->dst,0 ); +if (!dst) { + rt =ip_route_output_flow (sock_net (sk), &fl4, sk); +if (IS_ERR (rt)) + goto out; + + dst = &rt->dst; + } + +__sk_dst_set (sk, dst); + +out: +bh_unlock_sock (sk); +}EXPORT_SYMBOL_GPL (ipv4_sk_update_pmtu); void ipv4_redirect(struct sk_buff *skb, struct net *net,
Signature · 1 line
1.7.10.4
PATCH 69/86 ipv4: Add a socket release callback for datagram sockets
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 1c4fa590068ef4e257cb7b27643a3ee34cf9163b ]
This implements a socket release callback function to check if the socket cached route got invalid during the time we owned the socket. The function is used from udp, raw and ping sockets.
--- include/net/ip.h | 2 ++ net/ipv4/datagram.c | 25 +++++++++++++++++++++++++ net/ipv4/ping.c | 1 + net/ipv4/raw.c | 1 + net/ipv4/udp.c | 1 + 5 files changed, 30 insertions(+)
include/net/ip.h +2 -0
@@ -141,6 +141,8 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)extern int ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len); +extern void ip4_datagram_release_cb (struct sock *sk); +struct ip_reply_arg {struct kvec iov[1 ];int flags;
net/ipv4/datagram.c +25 -0
@@ -85,3 +85,28 @@ out:return err; }EXPORT_SYMBOL (ip4_datagram_connect); + +void ip4_datagram_release_cb (struct sock *sk) +{ +const struct inet_sock *inet =inet_sk (sk); +const struct ip_options_rcu *inet_opt; +__be32 daddr = inet->inet_daddr; +struct flowi4 fl4; +struct rtable *rt; + +if (!__sk_dst_get (sk) ||__sk_dst_check (sk,0 )) +return ; + +rcu_read_lock (); + inet_opt =rcu_dereference (inet->inet_opt); +if (inet_opt && inet_opt->opt.srr) + daddr = inet_opt->opt.faddr; + rt =ip_route_output_ports (sock_net (sk), &fl4, sk, daddr, + inet->inet_saddr, inet->inet_dport, + inet->inet_sport, sk->sk_protocol, +RT_CONN_FLAGS (sk), sk->sk_bound_dev_if); +if (!IS_ERR (rt)) +__sk_dst_set (sk, &rt->dst); +rcu_read_unlock (); +} +EXPORT_SYMBOL_GPL (ip4_datagram_release_cb);
net/ipv4/ping.c +1 -0
@@ -744,6 +744,7 @@ struct proto ping_prot = { .recvmsg = ping_recvmsg, .bind = ping_bind, .backlog_rcv = ping_queue_rcv_skb, + .release_cb = ip4_datagram_release_cb, .hash = ping_v4_hash, .unhash = ping_v4_unhash, .get_port = ping_v4_get_port,
net/ipv4/raw.c +1 -0
@@ -894,6 +894,7 @@ struct proto raw_prot = { .recvmsg = raw_recvmsg, .bind = raw_bind, .backlog_rcv = raw_rcv_skb, + .release_cb = ip4_datagram_release_cb, .hash = raw_hash_sk, .unhash = raw_unhash_sk, .obj_size = sizeof(struct raw_sock),
net/ipv4/udp.c +1 -0
@@ -1952,6 +1952,7 @@ struct proto udp_prot = { .recvmsg = udp_recvmsg, .sendpage = udp_sendpage, .backlog_rcv = __udp_queue_rcv_skb, + .release_cb = ip4_datagram_release_cb, .hash = udp_lib_hash, .unhash = udp_lib_unhash, .rehash = udp_v4_rehash,
Signature · 1 line
1.7.10.4
PATCH 70/86 ipv4: Fix route refcount on pmtu discovery
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 9a2a0fefaf476a4be4d153792eaa600203b83edf ]
git commit 9cb3a50c (ipv4: Invalidate the socket cached route on pmtu events if possible) introduced a refcount problem. We don't get a refcount on the route if we get it from__sk_dst_get(), but we need one if we want to reuse this route because __sk_dst_set() releases the refcount of the old route. This patch adds proper refcount handling for that case. We introduce a 'new' flag to indicate that we are going to use a new route and we release the old route only if we replace it by a new one.
--- net/ipv4/route.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/ipv4/route.c +9 -2
@@ -985,6 +985,7 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)struct flowi4 fl4;struct rtable *rt;struct dst_entry *dst; +bool new = false;bh_lock_sock (sk); rt = (struct rtable *)__sk_dst_get (sk);
@@ -1000,20 +1001,26 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) rt =ip_route_output_flow (sock_net (sk), &fl4, sk);if (IS_ERR (rt)) goto out; + + new = true; }__ip_rt_update_pmtu ((struct rtable *) rt->dst.path, &fl4, mtu); dst =dst_check (&rt->dst,0 );if (!dst) { +if (new) +dst_release (&rt->dst); + rt =ip_route_output_flow (sock_net (sk), &fl4, sk);if (IS_ERR (rt)) goto out; - dst = &rt->dst; + new = true; } -__sk_dst_set (sk, dst); +if (new) +__sk_dst_set (sk, &rt->dst); out:bh_unlock_sock (sk);
Signature · 1 line
1.7.10.4
PATCH 71/86 tcp: detect SYN/data drop when F-RTO is disabled
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Yuchung Cheng <[email protected]>
[ Upstream commit 9d475971466bf0e4c65a88d46031b8127a767897 ]
On receiving the SYN-ACK, Fast Open checks icsk_retransmit for SYN retransmission to detect SYN/data drops. But if F-RTO is disabled, icsk_retransmit is reset at step D of tcp_fastretrans_alert() ( under tcp_ack()) before tcp_rcv_fastopen_synack(). The fix is to use total_retrans instead which accounts for SYN retransmission regardless the use of F-RTO.
--- net/ipv4/tcp_input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv4/tcp_input.c +1 -2
@@ -5678,8 +5678,7 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack,* the remote receives only the retransmitted (regular) SYNs: either * the original SYN-data or the corresponding SYN-ACK is lost. */ - syn_drop = (cookie->len <=0 && data && -inet_csk (sk)->icsk_retransmits); + syn_drop = (cookie->len <=0 && data && tp->total_retrans);tcp_fastopen_cache_set (sk, mss, cookie, syn_drop);
Signature · 1 line
1.7.10.4
PATCH 72/86 tcp: fix an infinite loop in tcp_slow_start()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 93e3a886683c28e718e146c827e9cc750c88817e ]
Since commit 9dc274151a548 (tcp: fix ABC in tcp_slow_start()), a nul snd_cwnd triggers an infinite loop in tcp_slow_start()
Avoid this infinite loop and log a one time error for further analysis. FRTO code is suspected to cause this bug.
--- net/ipv4/tcp_cong.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/ipv4/tcp_cong.c +10 -4
@@ -309,6 +309,12 @@ void tcp_slow_start(struct tcp_sock *tp) {int cnt;/* increase in packets */ unsigned int delta =0 ; +u32 snd_cwnd = tp->snd_cwnd; + +if (unlikely (!snd_cwnd)) { +pr_err_once ("snd_cwnd is nul, please report this bug.\n" ); + snd_cwnd =1U ; + }/* RFC3465: ABC Slow start * Increase only after a full MSS of bytes is acked
@@ -323,7 +329,7 @@ void tcp_slow_start(struct tcp_sock *tp)if (sysctl_tcp_max_ssthresh >0 && tp->snd_cwnd > sysctl_tcp_max_ssthresh) cnt = sysctl_tcp_max_ssthresh >>1 ;/* limited slow start */ else - cnt = tp->snd_cwnd;/* exponential increase */ + cnt = snd_cwnd;/* exponential increase */ /* RFC3465: ABC * We MAY increase by 2 if discovered delayed ack
@@ -333,11 +339,11 @@ void tcp_slow_start(struct tcp_sock *tp) tp->bytes_acked =0 ; tp->snd_cwnd_cnt += cnt; -while (tp->snd_cwnd_cnt >= tp->snd_cwnd) { - tp->snd_cwnd_cnt -= tp->snd_cwnd; +while (tp->snd_cwnd_cnt >= snd_cwnd) { + tp->snd_cwnd_cnt -= snd_cwnd; delta++; } - tp->snd_cwnd =min (tp->snd_cwnd + delta, tp->snd_cwnd_clamp); + tp->snd_cwnd =min (snd_cwnd + delta, tp->snd_cwnd_clamp); }EXPORT_SYMBOL_GPL (tcp_slow_start);
Signature · 1 line
1.7.10.4
PATCH 73/86 tcp: dont abort splice() after small transfers
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Willy Tarreau <[email protected]>
[ Upstream commit e9feca83d1496afabd0cc174863646e6d7101d85 ]
TCP coalescing added a regression in splice(socket->pipe) performance, for some workloads because of the way tcp_read_sock() is implemented.
The reason for this is the break when (offset + 1 != skb->len).
As we released the socket lock, this condition is possible if TCP stack added a fragment to the skb, which can happen with TCP coalescing.
So let's go back to the beginning of the loop when this happens, to give a chance to splice more frags per system call.
Doing so fixes the issue and makes GRO 10% faster than LRO on CPU-bound splice() workloads instead of the opposite.
--- net/ipv4/tcp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/ipv4/tcp.c +8 -4
@@ -1517,15 +1517,19 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, copied += used; offset += used; } -/* -* If recv_actor drops the lock (e.g. TCP splice +/* If recv_actor drops the lock (e.g. TCP splice * receive) the skb pointer might be invalid when * getting here: tcp_collapse might have deleted it * while aggregating skbs from the socket queue. */ - skb =tcp_recv_skb (sk, seq-1 , &offset); -if (!skb || (offset+1 != skb->len)) + skb =tcp_recv_skb (sk, seq -1 , &offset); +if (!skb)break ; +/* TCP coalescing might have appended data to the skb. +* Try to splice more frags +*/ +if (offset +1 != skb->len) +continue ; }if (tcp_hdr (skb)->fin) {sk_eat_skb (sk, skb, false);
Signature · 1 line
1.7.10.4
PATCH 74/86 tcp: splice: fix an infinite loop in tcp_read_sock()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 74b2a7b4ea60d5c1c94ac01ad001e16ac40132f3 ]
commit 02275a2ee7c0 (tcp: don't abort splice() after small transfers) added a regression.
[ 83.843570] INFO: rcu_sched self-detected stall on CPU
[ 83.844575] INFO: rcu_sched detected stalls on CPUs/tasks: { 6} (detected by 0, t=21002 jiffies, g=4457, c=4456, q=13132)
[ 83.844582] Task dump for CPU 6:
[ 83.844584] netperf R running task 0 8966 8952 0x0000000c
[ 83.844587] 0000000000000000 0000000000000006 0000000000006c6c 0000000000000000
[ 83.844589] 000000000000006c 0000000000000096 ffffffff819ce2bc ffffffffffffff10
[ 83.844592] ffffffff81088679 0000000000000010 0000000000000246 ffff880c4b9ddcd8
[ 83.844594] Call Trace:
[ 83.844596] [<ffffffff81088679>] ? vprintk_emit+0x1c9/0x4c0
[ 83.844601] [<ffffffff815ad449>] ? schedule+0x29/0x70
[ 83.844606] [<ffffffff81537bd2>] ? tcp_splice_data_recv+0x42/0x50
[ 83.844610] [<ffffffff8153beaa>] ? tcp_read_sock+0xda/0x260
[ 83.844613] [<ffffffff81537b90>] ? tcp_prequeue_process+0xb0/0xb0
[ 83.844615] [<ffffffff8153c0f0>] ? tcp_splice_read+0xc0/0x250
[ 83.844618] [<ffffffff814dc0c2>] ? sock_splice_read+0x22/0x30
[ 83.844622] [<ffffffff811b820b>] ? do_splice_to+0x7b/0xa0
[ 83.844627] [<ffffffff811ba4bc>] ? sys_splice+0x59c/0x5d0
[ 83.844630] [<ffffffff8119745b>] ? putname+0x2b/0x40
[ 83.844633] [<ffffffff8118bcb4>] ? do_sys_open+0x174/0x1e0
[ 83.844636] [<ffffffff815b6202>] ? system_call_fastpath+0x16/0x1bif recv_actor() returns 0, we should stop immediately, because looping wont give a chance to drain the pipe.
--- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp.c +1 -1
@@ -1508,7 +1508,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,break ; } used =recv_actor (desc, skb, offset, len); -if (used <0 ) { +if (used <=0 ) {if (!copied) copied = used;break ;
Signature · 1 line
1.7.10.4
PATCH 75/86 tcp: fix splice() and tcp collapsing interaction
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit fdd384558afc89793bf35db6b5263e80ee92093d ]
Under unusual circumstances, TCP collapse can split a big GRO TCP packet while its being used in a splice(socket->pipe) operation.
skb_splice_bits() releases the socket lock before calling splice_to_pipe().
[ 1081.353685] WARNING: at net/ipv4/tcp.c:1330 tcp_cleanup_rbuf+0x4d/0xfc() [ 1081.371956] Hardware name: System x3690 X5 -[7148Z68]- [ 1081.391820] cleanup rbuf bug: copied AD3BCF1 seq AD370AF rcvnxt AD3CF13
To fix this problem, we must eat skbs in tcp_recv_skb().
Remove the inline keyword from tcp_recv_skb() definition since it has three call sites.
--- net/ipv4/tcp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/ipv4/tcp.c +10 -3
@@ -1454,12 +1454,12 @@ static void tcp_service_net_dma(struct sock *sk, bool wait) }#endif -static inline struct sk_buff *tcp_recv_skb (struct sock *sk,u32 seq,u32 *off) +static struct sk_buff *tcp_recv_skb (struct sock *sk,u32 seq,u32 *off) {struct sk_buff *skb;u32 offset; - skb_queue_walk(&sk->sk_receive_queue, skb) { +while ((skb =skb_peek (&sk->sk_receive_queue)) !=NULL ) { offset = seq -TCP_SKB_CB (skb)->seq;if (tcp_hdr (skb)->syn) offset--;
@@ -1467,6 +1467,11 @@ static inline struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off) *off = offset;return skb; } +/* This looks weird, but this can happen if TCP collapsing +* splitted a fat GRO packet, while we released socket lock +* in skb_splice_bits() +*/ +sk_eat_skb (sk, skb, false); }return NULL ; }
@@ -1546,8 +1551,10 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,tcp_rcv_space_adjust (sk);/* Clean up data we have read: This will do ACK frames. */ -if (copied >0 ) +if (copied >0 ) { +tcp_recv_skb (sk, seq, &offset);tcp_cleanup_rbuf (sk, copied); + }return copied; }EXPORT_SYMBOL (tcp_read_sock);
Signature · 1 line
1.7.10.4
PATCH 76/86 net: splice: avoid high order page splitting
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 4678414601960b3d60b651d82e2913c48c53508d ]
splice() can handle pages of any order, but network code tries hard to split them in PAGE_SIZE units. Not quite successfully anyway, as __splice_segment() assumed poff < PAGE_SIZE. This is true for the skb->data part, not necessarily for the fragments.
This patch removes this logic to give the pages as they are in the skb.
--- net/core/skbuff.c | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-)
net/core/skbuff.c +9 -29
@@ -1682,20 +1682,6 @@ static bool spd_fill_page(struct splice_pipe_desc *spd,return false; } -static inline void __segment_seek (struct page **page,unsigned int *poff, -unsigned int *plen,unsigned int off) -{ -unsigned long n; - - *poff += off; - n = *poff /PAGE_SIZE ; -if (n) - *page =nth_page (*page, n); - - *poff = *poff %PAGE_SIZE ; - *plen -= off; -} - static bool __splice_segment(struct page *page, unsigned int poff, unsigned int plen, unsigned int *off, unsigned int *len, struct sk_buff *skb,
@@ -1703,6 +1689,8 @@ static bool __splice_segment(struct page *page, unsigned int poff,struct sock *sk, struct pipe_inode_info *pipe) { + unsigned int flen; +if (!*len)return true;
@@ -1713,24 +1701,16 @@ static bool __splice_segment(struct page *page, unsigned int poff, }/* ignore any bits we already processed */ -if (*off) { -__segment_seek (&page, &poff, &plen, *off); - *off =0 ; - } - -do { -unsigned int flen =min (*len, plen); + poff += *off; + plen -= *off; + *off =0 ; -/* the linear region may spread across several pages */ - flen = min_t(unsigned int, flen, PAGE_SIZE - poff); + flen =min (*len, plen); -if (spd_fill_page (spd, pipe, page, &flen, poff, skb, linear, sk)) -return true; - -__segment_seek (&page, &poff, &plen, flen); - *len -= flen; +if (spd_fill_page (spd, pipe, page, &flen, poff, skb, linear, sk)) +return true; - }while (*len && plen); + *len -= flen;return false; }
Signature · 1 line
1.7.10.4
PATCH 77/86 net: splice: fix __splice_segment()
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9049d7450887d54b199441144f8ba50fa4d8cf92 ]
commit 9ca1b22d6d2 (net: splice: avoid high order page splitting) forgot that skb->head could need a copy into several page frags.
This could be the case for loopback traffic mostly.
Also remove now useless skb argument from linear_to_page() and __splice_segment() prototypes.
--- net/core/skbuff.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
net/core/skbuff.c +15 -13
@@ -1606,7 +1606,7 @@ static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i)static struct page *linear_to_page (struct page *page,unsigned int *len,unsigned int *offset, -struct sk_buff *skb,struct sock *sk) +struct sock *sk) {struct page *p = sk->sk_sndmsg_page;unsigned int off;
@@ -1658,14 +1658,14 @@ static bool spd_can_coalesce(const struct splice_pipe_desc *spd,static bool spd_fill_page (struct splice_pipe_desc *spd,struct pipe_inode_info *pipe,struct page *page,unsigned int *len,unsigned int offset, -struct sk_buff *skb,bool linear, +bool linear,struct sock *sk) {if (unlikely (spd->nr_pages ==MAX_SKB_FRAGS ))return true;if (linear) { - page =linear_to_page (page, len, &offset, skb, sk); + page =linear_to_page (page, len, &offset, sk);if (!page)return true; }
@@ -1684,13 +1684,11 @@ static bool spd_fill_page(struct splice_pipe_desc *spd,static bool __splice_segment (struct page *page,unsigned int poff,unsigned int plen,unsigned int *off, -unsigned int *len,struct sk_buff *skb, +unsigned int *len,struct splice_pipe_desc *spd,bool linear,struct sock *sk,struct pipe_inode_info *pipe) { -unsigned int flen; -if (!*len)return true;
@@ -1705,12 +1703,16 @@ static bool __splice_segment(struct page *page, unsigned int poff, plen -= *off; *off =0 ; - flen =min (*len, plen); - -if (spd_fill_page (spd, pipe, page, &flen, poff, skb, linear, sk)) -return true; +do { +unsigned int flen =min (*len, plen); - *len -= flen; +if (spd_fill_page (spd, pipe, page, &flen, poff, + linear, sk)) +return true; + poff += flen; + plen -= flen; + *len -= flen; + }while (*len && plen);return false; }
@@ -1733,7 +1735,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,if (__splice_segment (virt_to_page (skb->data), (unsigned long ) skb->data & (PAGE_SIZE -1 ),skb_headlen (skb), - offset, len, skb, spd, + offset, len, spd,skb_head_is_locked (skb), sk, pipe))return true;
@@ -1746,7 +1748,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,if (__splice_segment (skb_frag_page (f), f->page_offset,skb_frag_size (f), - offset, len, skb, spd, false, sk, pipe)) + offset, len, spd, false, sk, pipe))return true; }
Signature · 1 line
1.7.10.4
PATCH 78/86 sparc64: Add missing HAVE_ARCH_TRANSPARENT_HUGEPAGE.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit f53f5f1e2a84c2a95c47f28b0859ef5eee34569d ]
This got missed in the cleanups done for the S390 THP support.
--- arch/sparc/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/sparc/Kconfig +1 -0
@@ -56,6 +56,7 @@ config SPARC64 select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select HAVE_SYSCALL_WRAPPERS + select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD select HAVE_SYSCALL_TRACEPOINTS
Signature · 1 line
1.7.10.4
PATCH 79/86 sparc64: Fix gfp_flags setting in tsb_grow().
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 95a2fea6fbb81f56e2ecb60ef0c31e075d6a8995 ]
We should "|= more_flags" rather than "= more_flags".
--- arch/sparc/mm/tsb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/mm/tsb.c +1 -1
@@ -331,7 +331,7 @@ void tsb_grow(struct mm_struct *mm, unsigned long tsb_index, unsigned long rss) retry_tsb_alloc: gfp_flags =GFP_KERNEL ;if (new_size > (PAGE_SIZE *2 )) - gfp_flags = __GFP_NOWARN | __GFP_NORETRY; + gfp_flags |= __GFP_NOWARN | __GFP_NORETRY; new_tsb =kmem_cache_alloc_node (tsb_caches[new_cache_index], gfp_flags,numa_node_id ());
Signature · 1 line
1.7.10.4
PATCH 80/86 xfrm: release neighbor upon dst destruction
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Romain KUNTZ <[email protected]>
[ Upstream commit 2894f6da7e382a42948cc42ab52148dddf281c48 ]
Neighbor is cloned in xfrm6_fill_dst but seems to never be released. Neighbor entry should be released when XFRM6 dst entry is destroyed in xfrm6_dst_destroy, otherwise references may be kept forever on the device pointed by the neighbor entry.
I may not have understood all the subtleties of XFRM & dst so I would be happy to receive comments on this patch.
--- net/ipv6/xfrm6_policy.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/xfrm6_policy.c +2 -0
@@ -236,6 +236,8 @@ static void xfrm6_dst_destroy(struct dst_entry *dst) {struct xfrm_dst *xdst = (struct xfrm_dst *)dst; +if (likely (xdst->u.rt6.n)) +neigh_release (xdst->u.rt6.n);if (likely (xdst->u.rt6.rt6i_idev))in6_dev_put (xdst->u.rt6.rt6i_idev);dst_destroy_metrics_generic (dst);
Signature · 1 line
1.7.10.4
PATCH 81/86 ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 0b652fb68c02c1acd0307d3acac4ae7123536031 ]
If a qdisc is installed on a ppp device, its possible to get a lockdep splat under stress, because nested dev_queue_xmit() can lock busylock a second time (on a different device, so its a false positive)
Avoid this problem using a distinct lock_class_key for ppp devices.
--- drivers/net/ppp/ppp_generic.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ppp/ppp_generic.c +8 -0
@@ -1021,7 +1021,15 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return err; } +static struct lock_class_key ppp_tx_busylock; +static int ppp_dev_init (struct net_device *dev) +{ + dev->qdisc_tx_busylock = &ppp_tx_busylock; +return 0 ; +} +static const struct net_device_ops ppp_netdev_ops = { + .ndo_init = ppp_dev_init, .ndo_start_xmit = ppp_start_xmit, .ndo_do_ioctl = ppp_net_ioctl, };
Signature · 1 line
1.7.10.4
PATCH 82/86 ipv6: fix race condition regarding dst->expires and dst->from.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
[ Upstream commit eaf11ca939f83c273740d5bcec7225969ae95295 ]
Eric Dumazet wrote:
| Some strange crashes happen in rt6_check_expired(), with access | to random addresses. | | At first glance, it looks like the RTF_EXPIRES and | stuff added in commit 1716a96101c49186b | (ipv6: fix problem with expired dst cache) | are racy : same dst could be manipulated at the same time | on different cpus. | | At some point, our stack believes rt->dst.from contains a dst pointer, | while its really a jiffie value (as rt->dst.expires shares the same area | of memory) | | rt6_update_expires() should be fixed, or am I missing something ? | | CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
Because we do not have any locks for dst_entry, we cannot change essential structure in the entry; e.g., we cannot change reference to other entity.
To fix this issue, split 'from' and 'expires' field in dst_entry out of union. Once it is 'from' is assigned in the constructor, keep the reference until the very last stage of the life time of the object.
Of course, it is unsafe to change 'from', so make rt6_set_from simple just for fresh entries.
--- include/net/dst.h | 8 ++------ include/net/ip6_fib.h | 39 ++++++++++++--------------------------- net/core/dst.c | 1 + net/ipv6/route.c | 8 +++----- 4 files changed, 18 insertions(+), 38 deletions(-)
include/net/dst.h +2 -6
@@ -36,13 +36,9 @@ struct dst_entry {struct net_device *dev;struct dst_ops *ops;unsigned long _metrics; -union { -unsigned long expires; -/* point to where the dst_entry copied from */ -struct dst_entry *from; - }; +unsigned long expires;struct dst_entry *path; -void *__pad0; +struct dst_entry *from;#ifdef CONFIG_XFRM struct xfrm_state *xfrm;#else
include/net/ip6_fib.h +12 -27
@@ -156,50 +156,35 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)static inline void rt6_clean_expires (struct rt6_info *rt) { -if (!(rt->rt6i_flags &RTF_EXPIRES ) && rt->dst.from) -dst_release (rt->dst.from); - rt->rt6i_flags &= ~RTF_EXPIRES ; - rt->dst.from =NULL ; }static inline void rt6_set_expires (struct rt6_info *rt,unsigned long expires) { -if (!(rt->rt6i_flags &RTF_EXPIRES ) && rt->dst.from) -dst_release (rt->dst.from); - - rt->rt6i_flags |=RTF_EXPIRES ; rt->dst.expires = expires; + rt->rt6i_flags |=RTF_EXPIRES ; } -static inline void rt6_update_expires (struct rt6_info *rt,int timeout) +static inline void rt6_update_expires (struct rt6_info *rt0,int timeout) { -if (!(rt->rt6i_flags &RTF_EXPIRES )) { -if (rt->dst.from) -dst_release (rt->dst.from); -/* dst_set_expires relies on expires == 0 -* if it has not been set previously. -*/ - rt->dst.expires =0 ; - } - -dst_set_expires (&rt->dst, timeout); - rt->rt6i_flags |=RTF_EXPIRES ; +struct rt6_info *rt; + +for (rt = rt0; rt && !(rt->rt6i_flags &RTF_EXPIRES ); + rt = (struct rt6_info *)rt->dst.from); +if (rt && rt != rt0) + rt0->dst.expires = rt->dst.expires; + +dst_set_expires (&rt0->dst, timeout); + rt0->rt6i_flags |=RTF_EXPIRES ; }static inline void rt6_set_from (struct rt6_info *rt,struct rt6_info *from) {struct dst_entry *new = (struct dst_entry *) from; -if (!(rt->rt6i_flags &RTF_EXPIRES ) && rt->dst.from) { -if (new == rt->dst.from) -return ; -dst_release (rt->dst.from); - } - rt->rt6i_flags &= ~RTF_EXPIRES ; - rt->dst.from = new;dst_hold (new); + rt->dst.from = new; }struct fib6_walker_t {
net/core/dst.c +1 -0
@@ -179,6 +179,7 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev,dst_init_metrics (dst, dst_default_metrics, true); dst->expires =0UL ; dst->path = dst; + dst->from =NULL ;#ifdef CONFIG_XFRM dst->xfrm =NULL ;#endif
net/ipv6/route.c +3 -5
@@ -297,6 +297,7 @@ static void ip6_dst_destroy(struct dst_entry *dst) {struct rt6_info *rt = (struct rt6_info *)dst;struct inet6_dev *idev = rt->rt6i_idev; +struct dst_entry *from = dst->from;if (rt->n)neigh_release (rt->n);
@@ -309,8 +310,8 @@ static void ip6_dst_destroy(struct dst_entry *dst)in6_dev_put (idev); } -if (!(rt->rt6i_flags &RTF_EXPIRES ) && dst->from) -dst_release (dst->from); + dst->from =NULL ; +dst_release (from);if (rt6_has_peer (rt)) {struct inet_peer *peer =rt6_peer_ptr (rt);
@@ -1007,7 +1008,6 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori rt->rt6i_gateway = ort->rt6i_gateway; rt->rt6i_flags = ort->rt6i_flags; -rt6_clean_expires (rt); rt->rt6i_metric =0 ;memcpy (&rt->rt6i_dst, &ort->rt6i_dst,sizeof (struct rt6key ));
@@ -1810,8 +1810,6 @@ static struct rt6_info *ip6_rt_copy(struct rt6_info *ort,if ((ort->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF )) == (RTF_DEFAULT |RTF_ADDRCONF ))rt6_set_from (rt, ort); -else -rt6_clean_expires (rt); rt->rt6i_metric =0 ;#ifdef CONFIG_IPV6_SUBTREES
Signature · 1 line
1.7.10.4
PATCH 83/86 ipv4: fix error handling in icmp_protocol.
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Li Wei <[email protected]>
[ Upstream commit a426b816575c9701ddcb12a793693dbcbcee5c2b ]
Now we handle icmp errors in each transport protocol's err_handler, for icmp protocols, that is ping_err. Since this handler only care of those icmp errors triggered by echo request, errors triggered by echo reply(which sent by kernel) are sliently ignored.
So wrap ping_err() with icmp_err() to deal with those icmp errors.
--- include/net/icmp.h | 1 + net/ipv4/af_inet.c | 2 +- net/ipv4/icmp.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)
include/net/icmp.h +1 -0
@@ -41,6 +41,7 @@ struct net;extern void icmp_send (struct sk_buff *skb_in,int type,int code,__be32 info);extern int icmp_rcv (struct sk_buff *skb); +extern void icmp_err (struct sk_buff *,u32 info);extern int icmp_init (void );extern void icmp_out_count (struct net *net,unsigned char type);
net/ipv4/af_inet.c +1 -1
@@ -1561,7 +1561,7 @@ static const struct net_protocol udp_protocol = {static const struct net_protocol icmp_protocol = { .handler = icmp_rcv, - .err_handler = ping_err, + .err_handler = icmp_err, .no_policy =1 , .netns_ok =1 , };
net/ipv4/icmp.c +23 -0
@@ -934,6 +934,29 @@ error: goto drop; } +void icmp_err (struct sk_buff *skb,u32 info) +{ +struct iphdr *iph = (struct iphdr *)skb->data; +struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2 )); +int type =icmp_hdr (skb)->type; +int code =icmp_hdr (skb)->code; +struct net *net =dev_net (skb->dev); + +/* +* Use ping_err to handle all icmp errors except those +* triggered by ICMP_ECHOREPLY which sent from kernel. +*/ +if (icmph->type !=ICMP_ECHOREPLY ) { +ping_err (skb, info); +return ; + } + +if (type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED ) +ipv4_update_pmtu (skb, net, info,0 ,0 ,IPPROTO_ICMP ,0 ); +else if (type ==ICMP_REDIRECT ) +ipv4_redirect (skb, net,0 ,0 ,IPPROTO_ICMP ,0 ); +} +/* * This table is the definition of how we handle ICMP. */
Signature · 1 line
1.7.10.4
PATCH 84/86 tcp: fix SYN-data space mis-accounting
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Yuchung Cheng <[email protected]>
[ Upstream commit f7983d26995f85994a08ee173ee7d0c4ff3da356 ]
In fast open the sender unncessarily reduces the space available for data in SYN by 12 bytes. This is because in the sender incorrectly reserves space for TS option twice in tcp_send_syn_data():tcp_mtu_to_mss() already accounts for TS option space. But it further reserves MAX_TCP_OPTION_SPACE when computing the payload space.
--- net/ipv4/tcp_output.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
net/ipv4/tcp_output.c +11 -7
@@ -1342,8 +1342,8 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)return 0 ; } -/* Calculate MSS. Not accounting for SACKs here. */ -int tcp_mtu_to_mss (struct sock *sk,int pmtu) +/* Calculate MSS not accounting any TCP options. */ +static inline int __tcp_mtu_to_mss (struct sock *sk,int pmtu) {const struct tcp_sock *tp =tcp_sk (sk);const struct inet_connection_sock *icsk =inet_csk (sk);
@@ -1372,13 +1372,17 @@ int tcp_mtu_to_mss(struct sock *sk, int pmtu)/* Then reserve room for full set of TCP options and 8 bytes of data */ if (mss_now <48 ) mss_now =48 ; - -/* Now subtract TCP options size, not including SACKs */ - mss_now -= tp->tcp_header_len -sizeof (struct tcphdr ); -return mss_now; } +/* Calculate MSS. Not accounting for SACKs here. */ +int tcp_mtu_to_mss (struct sock *sk,int pmtu) +{ +/* Subtract TCP options size, not including SACKs */ +return __tcp_mtu_to_mss (sk, pmtu) - + (tcp_sk (sk)->tcp_header_len -sizeof (struct tcphdr )); +} +/* Inverse of above */ int tcp_mss_to_mtu (struct sock *sk,int mss) {
@@ -2914,7 +2918,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)*/ if (tp->rx_opt.user_mss && tp->rx_opt.user_mss < tp->rx_opt.mss_clamp) tp->rx_opt.mss_clamp = tp->rx_opt.user_mss; - space =tcp_mtu_to_mss (sk,inet_csk (sk)->icsk_pmtu_cookie) - + space =__tcp_mtu_to_mss (sk,inet_csk (sk)->icsk_pmtu_cookie) -MAX_TCP_OPTION_SPACE ; syn_data = skb_copy_expand(syn, skb_headroom(syn), space,
Signature · 1 line
1.7.10.4
PATCH 85/86 mlx4_en: fix allocation of CPU affinity reverse-map
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Kleber Sacilotto de Souza <[email protected]>
[ Upstream commit 77c5d9e186705280ca6eff08f3280a5f70c79f8e ]
The mlx4_en driver allocates the number of objects for the CPU affinity reverse-map based on the number of rx rings of the device. However, mlx4_assign_eq() calls irq_cpu_rmap_add() as many times as IRQ's are assigned to EQ's, which can be as large as mlx4_dev->caps.comp_pool. If caps.comp_pool is larger than rx_ring_num we will eventually hit the BUG_ON() in cpu_rmap_add().
Fix this problem by allocating space for the maximum number of CPU affinity reverse-map objects we might want to add.
--- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -1435,7 +1435,7 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv) }#ifdef CONFIG_RFS_ACCEL - priv->dev->rx_cpu_rmap =alloc_irq_cpu_rmap (priv->rx_ring_num); + priv->dev->rx_cpu_rmap =alloc_irq_cpu_rmap (priv->mdev->dev->caps.comp_pool);if (!priv->dev->rx_cpu_rmap) goto err;
Signature · 1 line
1.7.10.4
Re: [PATCH 85/86] mlx4_en: fix allocation of CPU affinity reverse-map
This fix introduced a bug in SRIOV.
Should squash into it, the upstream commit:f74d525bc973f2003b55b1f71f377e31fb5d3c8b - "net/mlx4_en: Disable RFS in SRIOV virtual functions"
Thanks,
Amir
PATCH 86/86 team: unsyc the devices addresses when port is removed
In reply to Steven Rostedt3.6.11.1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Vlad Yasevich <[email protected]>
[ Upstream commit 972ea34911d5f81639d963224d00add37170bd52 ]
When a team port is removed, unsync all devices addresses that may have been synched to the port devices.
--- drivers/net/team/team.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/team/team.c +2 -0
@@ -1008,6 +1008,8 @@ static int team_port_del(struct team *team, struct net_device *port_dev)netdev_set_master (port_dev,NULL );team_port_disable_netpoll (port);vlan_vids_del_by_dev (port_dev, dev); +dev_uc_unsync (port_dev, dev); +dev_mc_unsync (port_dev, dev);dev_close (port_dev);team_port_leave (team, port);team_port_set_orig_mac (port);
Signature · 1 line
1.7.10.4
Quoted 2 lines · Steven Rostedt
Responses should be made by Fri Mar 29 2013. Anything received after that time might be too late.
I just realized that I wont be working Friday, so make that Thursday ;-)
-- Steve