)]}' { "log": [ { "commit": "a376bca61096c7a79393e8125b7ad4757ccff19c", "tree": "87bb6aeff773e334a620b3a9aed6b2771cfb9bca", "parents": [ "1a041a23da7c77b53c71fe11b4f940388bee37b1", "5447080cfa3c77154498dfbf225367ac85b4c2b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 27 09:21:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 27 09:21:00 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n s2io: fixing DBG_PRINT() macro\n ath9k: fix dma direction for map/unmap in ath_rx_tasklet\n net: dev_forward_skb should call nf_reset\n net sched: fix race in mirred device removal\n tun: avoid BUG, dump packet on GSO errors\n bonding: set device in RLB ARP packet handler\n wimax/i2400m: Add PID \u0026 VID for Intel WiMAX 6250\n ipv6: Don\u0027t add routes to ipv6 disabled interfaces.\n net: Fix skb_copy_expand() handling of -\u003ecsum_start\n net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c\n macvtap: Limit packet queue length\n ixgbe/igb: catch invalid VF settings\n bnx2x: Advance a module version\n bnx2x: Protect statistics ramrod and sequence number\n bnx2x: Protect a SM state change\n wireless: use netif_rx_ni in ieee80211_send_layer2_update\n" }, { "commit": "a9ad99a612763803b995ce551ca43b20beb1f888", "tree": "daff243cc83116bdcffc5f675d0f33c0f777cc69", "parents": [ "c736eefadb71a01a5e61e0de700f28f6952b4444", "f792af250de54309e4bc9f238db3623ead0a4507" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 26 13:26:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 26 13:26:09 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "c736eefadb71a01a5e61e0de700f28f6952b4444", "tree": "d6a7cb06755e24bb5a1a44b68802577c1ca303d8", "parents": [ "3b87956ea645fb4de7e59c7d0aa94de04be72615" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Thu Jul 22 09:54:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 25 21:58:46 2010 -0700" }, "message": "net: dev_forward_skb should call nf_reset\n\nWith conn-track zones and probably with different network\nnamespaces, the netfilter logic needs to be re-calculated\non packet receive. If the netfilter logic is not reset,\nit will not be recalculated properly. This patch adds\nthe nf_reset logic to dev_forward_skb.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3b87956ea645fb4de7e59c7d0aa94de04be72615", "tree": "0dde04e6dfad7cd76afbb31eff72a8f08a574a9c", "parents": [ "76ac21f5ef30e46397e405695eb1240ff0955209" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jul 22 18:45:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 24 21:04:20 2010 -0700" }, "message": "net sched: fix race in mirred device removal\n\nThis fixes hang when target device of mirred packet classifier\naction is removed.\n\nIf a mirror or redirection action is configured to cause packets\nto go to another device, the classifier holds a ref count, but was assuming\nthe adminstrator cleaned up all redirections before removing. The fix\nis to add a notifier and cleanup during unregister.\n\nThe new list is implicitly protected by RTNL mutex because\nit is held during filter add/delete as well as notifier.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "64e724f62ab743d55229cd5e27ec8b068b68eb16", "tree": "cc73b4a138f1fa2585f8bc4cb44f91c6c5751cc7", "parents": [ "be2b6e62357dd7ee56bdcb05e54002afb4830292" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Tue Jul 20 10:34:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:41:32 2010 -0700" }, "message": "ipv6: Don\u0027t add routes to ipv6 disabled interfaces.\n\nIf the interface has IPv6 disabled, don\u0027t add a multicast or\nlink-local route since we won\u0027t be adding a link-local address.\n\nReported-by: Mahesh Kelkar \u003cmaheshkelkar@gmail.com\u003e\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be2b6e62357dd7ee56bdcb05e54002afb4830292", "tree": "7a166ad319bad5756a49beb060b91234a3de5510", "parents": [ "00c5a9834b476a138158fb17d576da751727a9f1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:27:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:27:09 2010 -0700" }, "message": "net: Fix skb_copy_expand() handling of -\u003ecsum_start\n\nIt should only be adjusted if ip_summed \u003d\u003d CHECKSUM_PARTIAL.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00c5a9834b476a138158fb17d576da751727a9f1", "tree": "a06b8b779d11784bb29f380e00c438e16c28f41a", "parents": [ "8a35747a5d13b99e076b0222729e0caa48cb69b6" ], "author": { "name": "Andrea Shepard", "email": "andrea@persephoneslair.org", "time": "Thu Jul 22 09:12:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:25:18 2010 -0700" }, "message": "net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c\n\nMake pskb_expand_head() check ip_summed to make sure csum_start is really\ncsum_start and not csum before adjusting it.\n\nThis fixes a bug I encountered using a Sun Quad-Fast Ethernet card and VLANs.\nOn my configuration, the sunhme driver produces skbs with differing amounts\nof headroom on receive depending on the packet size. See line 2030 of\ndrivers/net/sunhme.c; packets smaller than RX_COPY_THRESHOLD have 52 bytes\nof headroom but packets larger than that cutoff have only 20 bytes.\n\nWhen these packets reach the VLAN driver, vlan_check_reorder_header()\ncalls skb_cow(), which, if the packet has less than NET_SKB_PAD (\u003d\u003d 32) bytes\nof headroom, uses pskb_expand_head() to make more.\n\nThen, pskb_expand_head() needs to adjust a lot of offsets into the skb,\nincluding csum_start. Since csum_start is a union with csum, if the packet\nhas a valid csum value this will corrupt it, which was the effect I observed.\nThe sunhme hardware computes receive checksums, so the skbs would be created\nby the driver with ip_summed \u003d\u003d CHECKSUM_COMPLETE and a valid csum field, and\nthen pskb_expand_head() would corrupt the csum field, leading to an \"hw csum\nerror\" message later on, for example in icmp_rcv() for pings larger than the\nsunhme RX_COPY_THRESHOLD.\n\nOn the basis of the comment at the beginning of include/linux/skbuff.h,\nI believe that the csum_start skb field is only meaningful if ip_csummed is\nCSUM_PARTIAL, so this patch makes pskb_expand_head() adjust it only in that\ncase to avoid corrupting a valid csum value.\n\nPlease see my more in-depth disucssion of tracking down this bug for\nmore details if you like:\n\nhttp://puellavulnerata.livejournal.com/112186.html\nhttp://puellavulnerata.livejournal.com/112567.html\nhttp://puellavulnerata.livejournal.com/112891.html\nhttp://puellavulnerata.livejournal.com/113096.html\nhttp://puellavulnerata.livejournal.com/113591.html\n\nI am not subscribed to this list, so please CC me on replies.\n\nSigned-off-by: Andrea Shepard \u003candrea@persephoneslair.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "567c7b0edec0200c5c6613f07c3d3b4034fdc836", "tree": "ee9724f1b9b8bed762a57877c4940074a37ce6a4", "parents": [ "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Wed Jul 21 15:33:01 2010 +1000" }, "committer": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Wed Jul 21 15:33:01 2010 +1000" }, "message": "mm: add context argument to shrinker callback to remaining shrinkers\n\nAdd the shrinkers missed in the first conversion of the API in\ncommit 7f8275d0d660c146de6ee3017e1e2e594c49e820 (\"mm: add context argument to\nshrinker callback\").\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\n" }, { "commit": "516bd664153d76f5c814633cee6500e2ff8e861b", "tree": "f67a1c70b013961849d3491ef22596cd0b0d9af9", "parents": [ "844b9a8707f1fcf0482e0c52f44a555e799ccda6", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)\n bridge: Partially disable netpoll support\n tcp: fix crash in tcp_xmit_retransmit_queue\n IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())\n ibmveth: lost IRQ while closing/opening device leads to service loss\n rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()\n vhost: avoid pr_err on condition guest can trigger\n ipmr: Don\u0027t leak memory if fib lookup fails.\n vhost-net: avoid flush under lock\n net: fix problem in reading sock TX queue\n net/core: neighbour update Oops\n net: skb_tx_hash() fix relative to skb_orphan_try()\n rfs: call sock_rps_record_flow() in tcp_splice_read()\n xfrm: do not assume that template resolving always returns xfrms\n hostap_pci: set dev-\u003ebase_addr during probe\n axnet_cs: use spin_lock_irqsave in ax_interrupt\n dsa: Fix Kconfig dependencies.\n act_nat: not all of the ICMP packets need an IP header payload\n r8169: incorrect identifier for a 8168dp\n Phonet: fix skb leak in pipe endpoint accept()\n Bluetooth: Update sec_level/auth_type for already existing connections\n ...\n" }, { "commit": "06ee1c261360545c97fd836fff9dbd10ebd9301b", "tree": "21a144e09d83db9afb374f4a331aea6c4dec15a8", "parents": [ "9acd56d3f2a05191ee369cbdd8c37dd547aa19b8" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jul 19 11:52:59 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 15:55:12 2010 -0400" }, "message": "wireless: use netif_rx_ni in ieee80211_send_layer2_update\n\nThese synthetic frames are all triggered from userland requests in\nprocess context.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16412\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "573201f36fd9c7c6d5218cdcd9948cee700b277d", "tree": "3fdd5cd05e26fdfe38d5d1a72b4d4aa41ecd181f", "parents": [ "45e77d314585869dfe43c82679f7e08c9b35b898" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 19 19:26:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 23:28:25 2010 -0700" }, "message": "bridge: Partially disable netpoll support\n\nThe new netpoll code in bridging contains use-after-free bugs\nthat are non-trivial to fix.\n\nThis patch fixes this by removing the code that uses skbs after\nthey\u0027re freed.\n\nAs a consequence, this means that we can no longer call bridge\nfrom the netpoll path, so this patch also removes the controller\nfunction in order to disable netpoll.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n\nThanks,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "45e77d314585869dfe43c82679f7e08c9b35b898", "tree": "73c6322600e47a44a8c171abff392a61eac53be9", "parents": [ "b508998f665ee6d6a15eae11be258c3e94c33562" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Mon Jul 19 01:16:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 12:43:49 2010 -0700" }, "message": "tcp: fix crash in tcp_xmit_retransmit_queue\n\nIt can happen that there are no packets in queue while calling\ntcp_xmit_retransmit_queue(). tcp_write_queue_head() then returns\nNULL and that gets deref\u0027ed to get sacked into a local var.\n\nThere is no work to do if no packets are outstanding so we just\nexit early.\n\nThis oops was introduced by 08ebd1721ab8fd (tcp: remove tp-\u003elost_out\nguard to make joining diff nicer).\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nReported-by: Lennart Schulte \u003clennart.schulte@nets.rwth-aachen.de\u003e\nTested-by: Lennart Schulte \u003clennart.schulte@nets.rwth-aachen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d9a9dc66eb8a8fd85c8546247e7e1d6023d0eb0f", "tree": "cedd329461bcfeaad782b574912dbe68dd28d00a", "parents": [ "ee2e6114de3bdb1c34f3910b690f990483e981ab" ], "author": { "name": "Arnaud Ebalard", "email": "arno@natisbad.org", "time": "Fri Jul 16 00:38:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 15:04:33 2010 -0700" }, "message": "IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())\n\nThe input handler for Type 2 Routing Header (mip6_rthdr_input())\nchecks if the CoA in the packet matches the CoA in the XFRM state.\n\nCurrent check is buggy: it compares the adddress in the Type 2\nRouting Header, i.e. the HoA, against the expected CoA in the state.\nThe comparison should be made against the address in the destination\nfield of the IPv6 header.\n\nThe bug remained unnoticed because the main (and possibly only current)\nuser of the code (UMIP MIPv6 Daemon) initializes the XFRM state with the\nunspecified address, i.e. explicitly allows everything.\n\nYoshifuji-san, can you ack that one?\n\nSigned-off-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea", "tree": "7950aa0bb0e2a338eed7d948c77cd62ec96bf0d8", "parents": [ "b0f77d0eae0c58a5a9691a067ada112ceeae2d00" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Thu Jul 15 13:22:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 15 22:38:43 2010 -0700" }, "message": "ipmr: Don\u0027t leak memory if fib lookup fails.\n\nThis was detected using two mcast router tables. The\npimreg for the second interface did not have a specific\nmrule, so packets received by it were handled by the\ndefault table, which had nothing configured.\n\nThis caused the ipmr_fib_lookup to fail, causing\nthe memory leak.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0f77d0eae0c58a5a9691a067ada112ceeae2d00", "tree": "2bab159a95f51e32dbb4eb2d554328de3190c678", "parents": [ "91a72a70594e5212c97705ca6a694bd307f7a26b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "message": "net: fix problem in reading sock TX queue\n\nFix problem in reading the tx_queue recorded in a socket. In\ndev_pick_tx, the TX queue is read by doing a check with\nsk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.\nThe problem is that there is not mutual exclusion across these\ncalls in the socket so it it is possible that the queue in the\nsock can be invalidated after sk_tx_queue_recorded is called so\nthat sk_tx_queue get returns -1, which sets 65535 in queue_index\nand thus dev_pick_tx returns 65536 which is a bogus queue and\ncan cause crash in dev_queue_xmit.\n\nWe fix this by only calling sk_tx_queue_get which does the proper\nchecks. The interface is that sk_tx_queue_get returns the TX queue\nif the sock argument is non-NULL and TX queue is recorded, else it\nreturns -1. sk_tx_queue_recorded is no longer used so it can be\ncompletely removed.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91a72a70594e5212c97705ca6a694bd307f7a26b", "tree": "98e86dae9f15d98b199c96e18128a71155ce0e8e", "parents": [ "87fd308cfc6b2e880bf717a740bd5c58d2aed10c" ], "author": { "name": "Doug Kehn", "email": "rdkehn@yahoo.com", "time": "Wed Jul 14 18:02:16 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 18:02:16 2010 -0700" }, "message": "net/core: neighbour update Oops\n\nWhen configuring DMVPN (GRE + openNHRP) and a GRE remote\naddress is configured a kernel Oops is observed. The\nobserseved Oops is caused by a NULL header_ops pointer\n(neigh-\u003edev-\u003eheader_ops) in neigh_update_hhs() when\n\nvoid (*update)(struct hh_cache*, const struct net_device*, const unsigned char *)\n\u003d neigh-\u003edev-\u003eheader_ops-\u003ecache_update;\n\nis executed. The dev associated with the NULL header_ops is\nthe GRE interface. This patch guards against the\npossibility that header_ops is NULL.\n\nThis Oops was first observed in kernel version 2.6.26.8.\n\nSigned-off-by: Doug Kehn \u003crdkehn@yahoo.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87fd308cfc6b2e880bf717a740bd5c58d2aed10c", "tree": "15c27522669b08a6d26efbcd447abf3d78ad13fb", "parents": [ "3a047bf87b1b6f69c62ab9fb28072c639cb7e2fa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jul 13 05:24:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 15:33:27 2010 -0700" }, "message": "net: skb_tx_hash() fix relative to skb_orphan_try()\n\ncommit fc6055a5ba31e2 (net: Introduce skb_orphan_try()) added early\norphaning of skbs.\n\nThis unfortunately added a performance regression in skb_tx_hash() in\ncase of stacked devices (bonding, vlans, ...)\n\nSince skb-\u003esk is now NULL, we cannot access sk-\u003esk_hash anymore to\nspread tx packets to multiple NIC queues on multiqueue devices.\n\nskb_tx_hash() in this case only uses skb-\u003eprotocol, same value for all\nflows.\n\nskb_orphan_try() can copy sk-\u003esk_hash into skb-\u003erxhash and skb_tx_hash()\ncan use this saved sk_hash value to compute its internal hash value.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a047bf87b1b6f69c62ab9fb28072c639cb7e2fa", "tree": "b134b9942d2b378b1afd81b07ffdfb948cd1439e", "parents": [ "d809ec895505e6f35fb1965f0946381ab4eaa474" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Jul 12 21:00:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 14:45:15 2010 -0700" }, "message": "rfs: call sock_rps_record_flow() in tcp_splice_read()\n\nrfs: call sock_rps_record_flow() in tcp_splice_read()\n\ncall sock_rps_record_flow() in tcp_splice_read(), so the applications using\nsplice(2) or sendfile(2) can utilize RFS.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n net/ipv4/tcp.c | 1 +\n 1 file changed, 1 insertion(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d809ec895505e6f35fb1965f0946381ab4eaa474", "tree": "479a8937a4fd736ed5db9d87bb3ff81ee60f5cd5", "parents": [ "ab83a38958ae7e419f18fabe9b2954a6087bfe0d" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Mon Jul 12 21:29:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 14:16:48 2010 -0700" }, "message": "xfrm: do not assume that template resolving always returns xfrms\n\nxfrm_resolve_and_create_bundle() assumed that, if policies indicated\npresence of xfrms, bundle template resolution would always return\nsome xfrms. This is not true for \u0027use\u0027 level policies which can\nresult in no xfrm\u0027s being applied if there is no suitable xfrm states.\nThis fixes a crash by this incorrect assumption.\n\nReported-by: George Spelvin \u003clinux@horizon.com\u003e\nBisected-by: George Spelvin \u003clinux@horizon.com\u003e\nTested-by: George Spelvin \u003clinux@horizon.com\u003e\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "336a283b9cbe47748ccd68fd8c5158f67cee644b", "tree": "0cbba3d49342ecbae14a8acf24b6ed9ed19956fa", "parents": [ "70c2efa5a32a7d38e66224844032160317fa7887" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:03:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:03:42 2010 -0700" }, "message": "dsa: Fix Kconfig dependencies.\n\nBased upon a report by Randy Dunlap.\n\nDSA needs PHYLIB, but PHYLIB needs NET_ETHERNET. So, in order\nto select PHYLIB we have to make DSA depend upon NET_ETHERNET.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "70c2efa5a32a7d38e66224844032160317fa7887", "tree": "34c0785993a0155a3677c97813f0d63e77b48dd2", "parents": [ "c4363d6acd8d2ec9156f6469c742351e5d122489" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri Jul 09 15:33:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:00:19 2010 -0700" }, "message": "act_nat: not all of the ICMP packets need an IP header payload\n\nnot all of the ICMP packets need an IP header payload, so we check the length\nof the skbs only when the packets should have an IP header payload.\n\nBased upon analysis and initial patch by Rodrigo Partearroyo González.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n----\n net/sched/act_nat.c | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "635f081541edef7644073f9be50ee5bf7c57ce63", "tree": "71c4933be2c8e7cd2287dc46bf52b1fa2840c69f", "parents": [ "045309820afe047920a50de25634dab46a1e851d" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Wed Jul 07 20:56:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 08 21:45:34 2010 -0700" }, "message": "Phonet: fix skb leak in pipe endpoint accept()\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "045309820afe047920a50de25634dab46a1e851d", "tree": "326155bfbb8ab90e1dc8238bd3e945dff41bb1af", "parents": [ "da213f41cdd445d3df468f8fe7f24fe4f4c48508" ], "author": { "name": "Ville Tervo", "email": "ville.tervo@nokia.com", "time": "Tue Jun 15 15:56:05 2010 +0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Jul 08 20:35:31 2010 -0300" }, "message": "Bluetooth: Update sec_level/auth_type for already existing connections\n\nUpdate auth level for already existing connections if it is lower\nthan required by new connection.\n\nSigned-off-by: Ville Tervo \u003cville.tervo@nokia.com\u003e\nReviewed-by: Emeltchenko Andrei \u003candrei.emeltchenko@nokia.com\u003e\nSigned-off-by: Luciano Coelho \u003cluciano.coelho@nokia.com\u003e\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "da213f41cdd445d3df468f8fe7f24fe4f4c48508", "tree": "958182b6a5fe75d733e2c29ff1f29598fbd97371", "parents": [ "e501d0553a7580fcc6654d7f58a5f061d31d00af" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Fri Jun 18 11:08:56 2010 +0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Jul 08 20:35:27 2010 -0300" }, "message": "Bluetooth: Reset the security level after an authentication failure\n\nWhen authentication fails for a connection the assumed security level\nshould be set back to BT_SECURITY_LOW so that subsequent connect\nattempts over the same link don\u0027t falsely assume that security is\nadequate enough.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "e501d0553a7580fcc6654d7f58a5f061d31d00af", "tree": "8f1489e92272e18cc5c222283bcbeccfe7bcecd2", "parents": [ "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@nokia.com", "time": "Thu Jul 08 12:14:41 2010 +0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Thu Jul 08 20:35:23 2010 -0300" }, "message": "Bluetooth: Check L2CAP pending status before sending connect request\n\nDue to race condition in L2CAP state machine L2CAP Connection Request\nmay be sent twice for SDP with the same source channel id. Problems\nreported connecting to Apple products, some carkit, Blackberry phones.\n\n...\n2010-06-07 21:18:03.651031 \u003c ACL data: handle 1 flags 0x02 dlen 12\n L2CAP(s): Connect req: psm 1 scid 0x0040\n2010-06-07 21:18:03.653473 \u003e HCI Event: Number of Completed Packets (0x13) plen 5\n handle 1 packets 1\n2010-06-07 21:18:03.653808 \u003e HCI Event: Auth Complete (0x06) plen 3\n status 0x00 handle 1\n2010-06-07 21:18:03.653869 \u003c ACL data: handle 1 flags 0x02 dlen 12\n L2CAP(s): Connect req: psm 1 scid 0x0040\n...\n\nPatch uses L2CAP_CONF_CONNECT_PEND flag to mark that L2CAP Connection\nRequest has been sent already.\n\nModified version of patch from Ville Tervo.\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "2aa72f612144a0a7d4b0b22ae7c122692ac6a013", "tree": "8af2d2ac975887a04b4e4109de3d785f7046979b", "parents": [ "78178c7d6e127fff6dba027315fd6914304b05cf", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits)\n NET: SB1250: Initialize .owner\n vxge: show startup message with KERN_INFO\n ll_temac: Fix missing iounmaps\n bridge: Clear IPCB before possible entry into IP stack\n bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference\n net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n net/ne: fix memory leak in ne_drv_probe()\n xfrm: fix xfrm by MARK logic\n virtio_net: fix oom handling on tx\n virtio_net: do not reschedule rx refill forever\n s2io: resolve statistics issues\n linux/net.h: fix kernel-doc warnings\n net: decreasing real_num_tx_queues needs to flush qdisc\n sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n qlge: fix a eeh handler to not add a pending timer\n qlge: Replacing add_timer() to mod_timer()\n usbnet: Set parent device early for netdev_printk()\n net: Revert \"rndis_host: Poll status channel before control channel\"\n netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT\n drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h\n ...\n" }, { "commit": "17762060c25590bfddd68cc1131f28ec720f405f", "tree": "20f774e21264c70a7d6690377db4cddd811278fc", "parents": [ "7f285fa78d4b81b8458f05e77fb6b46245121b4e" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 05 21:29:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:43:33 2010 -0700" }, "message": "bridge: Clear IPCB before possible entry into IP stack\n\nThe bridge protocol lives dangerously by having incestuous relations\nwith the IP stack. In this instance an abomination has been created\nwhere a bogus IPCB area from a bridged packet leads to a crash in\nthe IP stack because it\u0027s interpreted as IP options.\n\nThis patch papers over the problem by clearing the IPCB area in that\nparticular spot. To fix this properly we\u0027d also need to parse any\nIP options if present but I\u0027m way too lazy for that.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n\nCheers,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f285fa78d4b81b8458f05e77fb6b46245121b4e", "tree": "a4fa0d8e5cd102bb3aed7ad984de31e8a5f7575e", "parents": [ "bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 05 14:50:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:06 2010 -0700" }, "message": "bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference\n\nOn Tue, Jul 06, 2010 at 08:48:35AM +0800, Herbert Xu wrote:\n\u003e\n\u003e bridge: Restore NULL check in br_mdb_ip_get\n\nResend with proper attribution.\n\nbridge: Restore NULL check in br_mdb_ip_get\n\nSomewhere along the line the NULL check in br_mdb_ip_get went\nAWOL, causing crashes when we receive an IGMP packet with no\nmulticast table allocated.\n\nThis patch restores it and ensures all br_mdb_*_get functions\nuse it.\n\nReported-by: Frank Arnold \u003cfrank.arnold@amd.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n\nThanks,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "44b451f1633896de15d2d52e1a2bd462e80b7814", "tree": "14596f22d672a9b34e017422f772c2a0b967f2f1", "parents": [ "8bd39456bd5ab16d2a956dd3d567dcac9c73a6c0" ], "author": { "name": "Peter Kosyh", "email": "p.kosyh@gmail.com", "time": "Fri Jul 02 07:47:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 11:46:07 2010 -0700" }, "message": "xfrm: fix xfrm by MARK logic\n\nWhile using xfrm by MARK feature in\n2.6.34 - 2.6.35 kernels, the mark\nis always cleared in flowi structure via memset in\n_decode_session4 (net/ipv4/xfrm4_policy.c), so\nthe policy lookup fails.\nIPv6 code is affected by this bug too.\n\nSigned-off-by: Peter Kosyh \u003cp.kosyh@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94e6721d9ce938293a02736c5f7e42205a41ea68", "tree": "84717f7b9ed8132db312be443126704923bff288", "parents": [ "e2aec372ff4b7e78e79c308104a860ae0ed20950", "499031ac8a3df6738f6186ded9da853e8ea18253" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:04:49 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:04:49 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "499031ac8a3df6738f6186ded9da853e8ea18253", "tree": "fe80f44cf43ccd9a642cbdb5aba7637820e83657", "parents": [ "aea9d711f3d68c656ad31ab578ecfb0bb5cd7f97" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jul 02 10:05:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 02 10:05:01 2010 +0200" }, "message": "netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT\n\nWe should release dst if dst-\u003eerror is set.\n\nBug introduced in 2.6.14 by commit e104411b82f5c\n([XFRM]: Always release dst_entry on error in xfrm_lookup)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "bf988435bd5b53529f4408a8efb1f433f6ddfda9", "tree": "7805f577d019f587146b4fd1cf642faacfec2f14", "parents": [ "db048b69037e7fa6a7d9e95a1271a50dc08ae233" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 28 08:45:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 01:00:29 2010 -0700" }, "message": "ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH\n\nstruct ethtool_rxnfc was originally defined in 2.6.27 for the\nETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data\nfields. It was then extended in 2.6.30 to support various additional\ncommands. These commands should have been defined to use a new\nstructure, but it is too late to change that now.\n\nSince user-space may still be using the old structure definition\nfor the ETHTOOL_{G,S}RXFH commands, and since they do not need the\nadditional fields, only copy the originally defined fields to and\nfrom user-space.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db048b69037e7fa6a7d9e95a1271a50dc08ae233", "tree": "0202b5d2ed643021db2790f7fae3867d3d92a1f3", "parents": [ "c22d7ac844f1cb9c6a5fd20f89ebadc2feef891b" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 28 08:44:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 01:00:29 2010 -0700" }, "message": "ethtool: Fix potential kernel buffer overflow in ETHTOOL_GRXCLSRLALL\n\nOn a 32-bit machine, info.rule_cnt \u003e\u003d 0x40000000 leads to integer\noverflow and the buffer may be smaller than needed. Since\nETHTOOL_GRXCLSRLALL is unprivileged, this can presumably be used for at\nleast denial of service.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "31cafd958932a90174118ad062fdc37ffb6bf31c", "tree": "21f04c11d9e759c1f65cfaa1e4fbd79ee1e60753", "parents": [ "e7865c234fff2db474f21a62b2f906a70317c972", "e2f5b04563786d4b7d7648868de7e941a0649372" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 11:28:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 11:28:02 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)\n phylib: Add autoload support for the LXT973 phy.\n ISDN: hysdn, fix potential NULL dereference\n vxge: fix memory leak in vxge_alloc_msix() error path\n isdn/gigaset: correct CAPI connection state storage\n isdn/gigaset: encode HLC and BC together\n isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation\n isdn/gigaset: correct CAPI voice connection encoding\n isdn/gigaset: honor CAPI application\u0027s buffer size request\n cpmac: do not leak struct net_device on phy_connect errors\n smc91c92_cs: fix the problem that lan \u0026 modem does not work simultaneously\n ipv6: fix NULL reference in proxy neighbor discovery\n Bluetooth: Bring back var \u0027i\u0027 increment\n xfrm: check bundle policy existance before dereferencing it\n sky2: enable rx/tx in sky2_phy_reinit()\n cnic: Disable statistics initialization for eth clients that do not support statistics\n net: add dependency on fw class module to qlcnic and netxen_nic\n snmp: fix SNMP_ADD_STATS()\n hso: remove setting of low_latency flag\n udp: Fix bogus UFO packet generation\n lasi82596: fix netdev_mc_count conversion\n ...\n" }, { "commit": "9f888160bdcccf0565dd2774956b8d9456e610be", "tree": "6366fff5417a97bbecdfe4d5f4e63c6fe5cb1b97", "parents": [ "1a61a83ff59378a5613d8c706c4a660c353b62a8" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Jun 21 11:00:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:16:57 2010 -0700" }, "message": "ipv6: fix NULL reference in proxy neighbor discovery\n\nThe addition of TLLAO option created a kernel OOPS regression\nfor the case where neighbor advertisement is being sent via\nproxy path. When using proxy, ipv6_get_ifaddr() returns NULL\ncausing the NULL dereference.\n\nChange causing the bug was:\ncommit f7734fdf61ec6bb848e0bafc1fb8bad2c124bb50\nAuthor: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nDate: Fri Oct 2 11:39:15 2009 +0000\n\n make TLLAO option for NA packets configurable\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a61a83ff59378a5613d8c706c4a660c353b62a8", "tree": "0dfb244d877d4d03e74c96b58403faeb9d837750", "parents": [ "b1312c89f0016f778cac4f1536f1434e132f8713" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jun 18 14:24:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 22:08:37 2010 -0700" }, "message": "Bluetooth: Bring back var \u0027i\u0027 increment\n\ncommit ff6e2163f28a1094fb5ca5950fe2b43c3cf6bc7a accidentally added a\nregression on the bnep code. Fixing it.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1312c89f0016f778cac4f1536f1434e132f8713", "tree": "6cec9bc88430cf30f8409b8b607d2b6a6d2fd118", "parents": [ "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Thu Jun 24 14:35:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 14:35:00 2010 -0700" }, "message": "xfrm: check bundle policy existance before dereferencing it\n\nFix the bundle validation code to not assume having a valid policy.\nWhen we have multiple transformations for a xfrm policy, the bundle\ninstance will be a chain of bundles with only the first one having\nthe policy reference. When policy_genid is bumped it will expire the\nfirst bundle in the chain which is equivalent of expiring the whole\nchain.\n\nReported-bisected-and-tested-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b76ce56192bcf618013fb9aecd83488cffd645cc", "tree": "1a071da8b3e4fcc1fbfe67c99cc622372502edb2", "parents": [ "f799bdb355edaabd81b778087613409a8932fbe9" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Jun 16 13:57:32 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jun 22 13:21:18 2010 -0400" }, "message": "SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()\n\nIf the attempt to read the calldir fails, then instead of storing the read\nbytes, we currently discard them. This leads to a garbage final result when\nupon re-entry to the same routine, we read the remaining bytes.\n\nFixes the regression in bugzilla number 16213. Please see\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d16213\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "26cde9f7e2747b6d254b704594eed87ab959afa5", "tree": "ebb84a0ca60dd14801e9d398ee950c2527260c16", "parents": [ "13fea6d4f73942e6961aec97ba4c593619d18f6f" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jun 15 01:52:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 21 13:57:34 2010 -0700" }, "message": "udp: Fix bogus UFO packet generation\n\nIt has been reported that the new UFO software fallback path\nfails under certain conditions with NFS. I tracked the problem\ndown to the generation of UFO packets that are smaller than the\nMTU. The software fallback path simply discards these packets.\n\nThis patch fixes the problem by not generating such packets on\nthe UFO path.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nReviewed-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25442e06d20aaba7d7b16438078a562b3e4cf19b", "tree": "93df63e0e4f35d6d649150e2c49aa47af62961dd", "parents": [ "aabef8b240880439b91574c9a9e33dcc44bfd8c7" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Jun 15 06:14:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 13:49:14 2010 -0700" }, "message": "bridge: fdb cleanup runs too often\n\nIt is common in end-node, non STP bridges to set forwarding\ndelay to zero; which causes the forwarding database cleanup\nto run every clock tick. Change to run only as soon as needed\nor at next ageing timer interval which ever is sooner.\n\nUse round_jiffies_up macro rather than attempting round up\nby changing value.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa68a7822780fdc1295f7efb7e4313e62b447e75", "tree": "896a59f89b4f7a98cabc141cbfa30894536208bb", "parents": [ "97553f7f3e7a0305d017df9cc6e9589f64878437" ], "author": { "name": "Tom Hughes", "email": "tom@compton.nu", "time": "Tue Jun 15 22:24:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:47:30 2010 -0700" }, "message": "Clear IFF_XMIT_DST_RELEASE for teql interfaces\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16183\n\nThe sch_teql module, which can be used to load balance over a set of\nunderlying interfaces, stopped working after 2.6.30 and has been\nbroken in all kernels since then for any underlying interface which\nrequires the addition of link level headers.\n\nThe problem is that the transmit routine relies on being able to\naccess the destination address in the skb in order to do address\nresolution once it has decided which underlying interface it is going\nto transmit through.\n\nIn 2.6.31 the IFF_XMIT_DST_RELEASE flag was introduced, and set by\ndefault for all interfaces, which causes the destination address to be\nreleased before the transmit routine for the interface is called.\n\nThe solution is to clear that flag for teql interfaces.\n\nSigned-off-by: Tom Hughes \u003ctom@compton.nu\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d8d326dc7ae6bec2a999d674c5babb6bf490587a", "tree": "0169a23e34712e4a34db9c3dd658c14a59ded5d9", "parents": [ "fed396a585d8e1870b326f2e8e1888a72957abb8", "021570e55b7152843376b9d9f60624e3e05ac054" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 13:41:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 13:41:55 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "021570e55b7152843376b9d9f60624e3e05ac054", "tree": "03031adc6e025b582467c8d0ec6df6dec21e286d", "parents": [ "d6a574ff6bfb842bdb98065da053881ff527be46" ], "author": { "name": "Christoph Fritz", "email": "chf.fritz@googlemail.com", "time": "Wed Jun 16 16:37:34 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 16 15:49:16 2010 -0400" }, "message": "mac80211: fix warn, enum may be used uninitialized\n\nregression introduced by b8d92c9c141ee3dc9b3537b1f0ffb4a54ea8d9b2\n\nIn function ‘ieee80211_work_rx_queued_mgmt’:\nwarning: ‘rma’ may be used uninitialized in this function\n\nthis re-adds default value WORK_ACT_NONE back to rma\n\nSigned-off-by: Christoph Fritz \u003cchf.fritz@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fed396a585d8e1870b326f2e8e1888a72957abb8", "tree": "b2a291facdc6a259e1851db9a120d05bf5422795", "parents": [ "7e43cd66d36e8f0900e87d9d287c9ee649cbdd07" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jun 15 21:43:07 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 21:43:07 2010 -0700" }, "message": "bridge: Fix OOM crash in deliver_clone\n\nThe bridge multicast patches introduced an OOM crash in the forward\npath, when deliver_clone fails to clone the skb.\n\nReported-by: Mark Wagner \u003cmwagner@redhat.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21071344e67ebe2b2e1ae093728fc1d65246bcbd", "tree": "a7c3afb4c1884e98bd88156b3e9e256d03562351", "parents": [ "28c8e4790ca5ef75f54895ca46437f9fbb433ddf", "aea9d711f3d68c656ad31ab578ecfb0bb5cd7f97" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:58:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:58:02 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "e8d15e6460cb0eea00f2574a80d94496943403ba", "tree": "34b40fbf0d7dbd294c918ff3e12af11e5ca77e95", "parents": [ "e897082fe7a5b591dc4dd5599ac39081a7c8e482" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 13 10:50:46 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 17:16:54 2010 -0700" }, "message": "net: rxhash already set in __copy_skb_header\n\nNo need to copy rxhash again in __skb_clone()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e897082fe7a5b591dc4dd5599ac39081a7c8e482", "tree": "9d33789a1cbdffc0e77a1187d32b0051eb7648c4", "parents": [ "d49aba84fe775671133295658f43f4d142a517f9" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Jun 13 10:36:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 17:12:40 2010 -0700" }, "message": "net: fix deliver_no_wcard regression on loopback device\n\ndeliver_no_wcard is not being set in skb_copy_header.\nIn the skb_cloned case it is not being cleared and\nmay cause the skb to be dropped when the loopback device\npushes it back up the stack.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07a0f0f07a68014c92c752a5598102372bddf46e", "tree": "9429833f5f1f95066d9f4113cf224dcef7c4bd1e", "parents": [ "ae638c47dc040b8def16d05dc6acdd527628f231" ], "author": { "name": "Daniel Turull", "email": "daniel.turull@gmail.com", "time": "Thu Jun 10 23:08:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:08:11 2010 -0700" }, "message": "pktgen: Fix accuracy of inter-packet delay.\n\nThis patch correct a bug in the delay of pktgen. \nIt makes sure the inter-packet interval is accurate.\n\nSigned-off-by: Daniel Turull \u003cdaniel.turull@gmail.com\u003e\nSigned-off-by: Robert Olsson \u003crobert.olsson@its.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ae638c47dc040b8def16d05dc6acdd527628f231", "tree": "f3fa7015b8f4ed85d44d675d4a9f5f6c82063764", "parents": [ "597a264b1a9c7e36d1728f677c66c5c1f7e3b837" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 08 23:39:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:53:52 2010 -0700" }, "message": "pkt_sched: gen_estimator: add a new lock\n\ngen_kill_estimator() / gen_new_estimator() is not always called with\nRTNL held.\n\nnet/netfilter/xt_RATEEST.c is one user of these API that do not hold\nRTNL, so random corruptions can occur between \"tc\" and \"iptables\".\n\nAdd a new fine grained lock instead of trying to use RTNL in netfilter.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597a264b1a9c7e36d1728f677c66c5c1f7e3b837", "tree": "22db16f0a7b54ece127e127e152e9172456d9e1c", "parents": [ "00d9d6a185de89edc0649ca4ead58f0283dfcbac" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jun 03 09:30:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:23:34 2010 -0700" }, "message": "net: deliver skbs on inactive slaves to exact matches\n\nCurrently, the accelerated receive path for VLAN\u0027s will\ndrop packets if the real device is an inactive slave and\nis not one of the special pkts tested for in\nskb_bond_should_drop(). This behavior is different then\nthe non-accelerated path and for pkts over a bonded vlan.\n\nFor example,\n\nvlanx -\u003e bond0 -\u003e ethx\n\nwill be dropped in the vlan path and not delivered to any\npacket handlers at all. However,\n\nbond0 -\u003e vlanx -\u003e ethx\n\nand\n\nbond0 -\u003e ethx\n\nwill be delivered to handlers that match the exact dev,\nbecause the VLAN path checks the real_dev which is not a\nslave and netif_recv_skb() doesn\u0027t drop frames but only\ndelivers them to exact matches.\n\nThis patch adds a sk_buff flag which is used for tagging\nskbs that would previously been dropped and allows the\nskb to continue to skb_netif_recv(). Here we add\nlogic to check for the deliver_no_wcard flag and if it\nis set only deliver to handlers that match exactly. This\nmakes both paths above consistent and gives pkt handlers\na way to identify skbs that come from inactive slaves.\nWithout this patch in some configurations skbs will be\ndelivered to handlers with exact matches and in others\nbe dropped out right in the vlan path.\n\nI have tested the following 4 configurations in failover modes\nand load balancing modes.\n\n# bond0 -\u003e ethx\n\n# vlanx -\u003e bond0 -\u003e ethx\n\n# bond0 -\u003e vlanx -\u003e ethx\n\n# bond0 -\u003e ethx\n |\n vlanx -\u003e --\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00d9d6a185de89edc0649ca4ead58f0283dfcbac", "tree": "2c7bb666781736a94170624519182b68b13f099d", "parents": [ "81a95f049962ec20a9aed888e676208b206f0f2e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 22:24:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 18:39:27 2010 -0700" }, "message": "ipv6: fix ICMP6_MIB_OUTERRORS\n\nIn commit 1f8438a85366 (icmp: Account for ICMP out errors), I did a typo\non IPV6 side, using ICMP6_MIB_OUTMSGS instead of ICMP6_MIB_OUTERRORS\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ebedb22d2bacdcf577348eae77ab8f27c9db8ee8", "tree": "16abc0c02b45126e6064d6d9d71dc0cf9a870c72", "parents": [ "619baba195d92ec39379e24c151f4a640898d140", "08c801f8d45387a1b46066aad1789a9bb9c4b645" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:28:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:28:25 2010 -0700" }, "message": "Merge branch \u0027num_rx_queues\u0027 of git://kernel.ubuntu.com/rtg/net-2.6\n" }, { "commit": "aea34e7ae7a40bc72f9f11b5658160dfb4b90c48", "tree": "12bba1eacc4d0359c4d0b394368c2f439bcb1042", "parents": [ "e13647c158307f0e7ff5fc5bec34731f28917595" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jun 07 04:51:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:18:53 2010 -0700" }, "message": "caif: fix a couple range checks\n\nThe extra ! character means that these conditions are always false.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08c801f8d45387a1b46066aad1789a9bb9c4b645", "tree": "d82ec32778a908f5cd75a102d3d9dc4949986b22", "parents": [ "327723edebbbd621ed35b0d63073685eb225563e" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Tue Jun 08 17:51:27 2010 -0600" }, "committer": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Wed Jun 09 13:46:03 2010 -0600" }, "message": "net: Print num_rx_queues imbalance warning only when there are allocated queues\n\nBugLink: http://bugs.launchpad.net/bugs/591416\n\nThere are a number of network drivers (bridge, bonding, etc) that are not yet\nreceive multi-queue enabled and use alloc_netdev(), so don\u0027t print a\nnum_rx_queues imbalance warning in that case.\n\nAlso, only print the warning once for those drivers that _are_ multi-queue\nenabled.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "327723edebbbd621ed35b0d63073685eb225563e", "tree": "5983bf544284c4bd11028e198c937f86be358dc4", "parents": [ "035320d54758e21227987e3aae0d46e7a04f4ddc", "b054b747a694927879c94dd11af54d04346aed7d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 11:13:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 11:13:23 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "aea9d711f3d68c656ad31ab578ecfb0bb5cd7f97", "tree": "b4681f25962090e6449fc74a68085fae577b476d", "parents": [ "7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5" ], "author": { "name": "Sven Wegener", "email": "sven.wegener@stealer.net", "time": "Wed Jun 09 16:10:57 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 16:10:57 2010 +0200" }, "message": "ipvs: Add missing locking during connection table hashing and unhashing\n\nThe code that hashes and unhashes connections from the connection table\nis missing locking of the connection being modified, which opens up a\nrace condition and results in memory corruption when this race condition\nis hit.\n\nHere is what happens in pretty verbose form:\n\nCPU 0\t\t\t\t\tCPU 1\n------------\t\t\t\t------------\nAn active connection is terminated and\nwe schedule ip_vs_conn_expire() on this\nCPU to expire this connection.\n\n\t\t\t\t\tIRQ assignment is changed to this CPU,\n\t\t\t\t\tbut the expire timer stays scheduled on\n\t\t\t\t\tthe other CPU.\n\n\t\t\t\t\tNew connection from same ip:port comes\n\t\t\t\t\tin right before the timer expires, we\n\t\t\t\t\tfind the inactive connection in our\n\t\t\t\t\tconnection table and get a reference to\n\t\t\t\t\tit. We proper lock the connection in\n\t\t\t\t\ttcp_state_transition() and read the\n\t\t\t\t\tconnection flags in set_tcp_state().\n\nip_vs_conn_expire() gets called, we\nunhash the connection from our\nconnection table and remove the hashed\nflag in ip_vs_conn_unhash(), without\nproper locking!\n\n\t\t\t\t\tWhile still holding proper locks we\n\t\t\t\t\twrite the connection flags in\n\t\t\t\t\tset_tcp_state() and this sets the hashed\n\t\t\t\t\tflag again.\n\nip_vs_conn_expire() fails to expire the\nconnection, because the other CPU has\nincremented the reference count. We try\nto re-insert the connection into our\nconnection table, but this fails in\nip_vs_conn_hash(), because the hashed\nflag has been set by the other CPU. We\nre-schedule execution of\nip_vs_conn_expire(). Now this connection\nhas the hashed flag set, but isn\u0027t\nactually hashed in our connection table\nand has a dangling list_head.\n\n\t\t\t\t\tWe drop the reference we held on the\n\t\t\t\t\tconnection and schedule the expire timer\n\t\t\t\t\tfor timeouting the connection on this\n\t\t\t\t\tCPU. Further packets won\u0027t be able to\n\t\t\t\t\tfind this connection in our connection\n\t\t\t\t\ttable.\n\n\t\t\t\t\tip_vs_conn_expire() gets called again,\n\t\t\t\t\twe think it\u0027s already hashed, but the\n\t\t\t\t\tlist_head is dangling and while removing\n\t\t\t\t\tthe connection from our connection table\n\t\t\t\t\twe write to the memory location where\n\t\t\t\t\tthis list_head points to.\n\nThe result will probably be a kernel oops at some other point in time.\n\nThis race condition is pretty subtle, but it can be triggered remotely.\nIt needs the IRQ assignment change or another circumstance where packets\ncoming from the same ip:port for the same service are being processed on\ndifferent CPUs. And it involves hitting the exact time at which\nip_vs_conn_expire() gets called. It can be avoided by making sure that\nall packets from one connection are always processed on the same CPU and\ncan be made harder to exploit by changing the connection timeouts to\nsome custom values.\n\nSigned-off-by: Sven Wegener \u003csven.wegener@stealer.net\u003e\nCc: stable@kernel.org\nAcked-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b054b747a694927879c94dd11af54d04346aed7d", "tree": "91651e415fde622e53551286dd57279a4661e7cf", "parents": [ "6db6340c42d027b6364d49fa99d69019aca24de4" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Jun 07 21:50:07 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 14:41:54 2010 -0400" }, "message": "mac80211: fix deauth before assoc\n\nWhen we receive a deauthentication frame before\nhaving successfully associated, we neither print\na message nor abort assocation. The former makes\nit hard to debug, while the latter later causes\na warning in cfg80211 when, as will typically be\nthe case, association timed out.\n\nThis warning was reported by many, e.g. in\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d15981,\nbut I couldn\u0027t initially pinpoint it. I verified\nthe fix by hacking hostapd to send a deauth frame\ninstead of an association response.\n\nCc: stable@kernel.org\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nTested-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "35dd0509b21e4b5bab36b9eb80c8dab0322f5007", "tree": "ff718895d1e443d2aa831fea2d579c547a3082f3", "parents": [ "e500ae5b535a5209fd397fcc542e3b3290fc2fc5" ], "author": { "name": "Holger Schurig", "email": "holgerschurig@gmail.com", "time": "Mon Jun 07 16:33:49 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:44:40 2010 -0400" }, "message": "mac80211: fix function pointer check\n\nThis makes \"iw wlan0 dump survey\" work again with\nmac80211-based drivers that support it, e.g. ath5k.\n\nSigned-off-by: Holger Schurig \u003cholgerschurig@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "035320d54758e21227987e3aae0d46e7a04f4ddc", "tree": "9ad66a45ab0b0d903ebcbe435894d1fb9d5d78f5", "parents": [ "3fd7fa4a89f0b85b9b33e922f15a2289c0fb8499" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 06 23:48:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 02:57:14 2010 -0700" }, "message": "ipmr: dont corrupt lists\n\nipmr_rules_exit() and ip6mr_rules_exit() free a list of items, but\nforget to properly remove these items from list. List head is not\nchanged and still points to freed memory.\n\nThis can trigger a fault later when icmpv6_sk_exit() is called.\n\nFix is to either reinit list, or use list_del() to properly remove items\nfrom list before freeing them.\n\nbugzilla report : https://bugzilla.kernel.org/show_bug.cgi?id\u003d16120\n\nIntroduced by commit d1db275dd3f6e4 (ipv6: ip6mr: support multiple\ntables) and commit f0ad0860d01e (ipv4: ipmr: support multiple tables)\n\nReported-by: Alex Zhavnerchik \u003calex.vizor@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ffb335e8d696affc04f963bf73ce2196f80edb9", "tree": "91cbe2f0876ee74971fd396ce59e848242810d0e", "parents": [ "72e09ad107e78d69ff4d3b97a69f0aad2b77280f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 06 15:34:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 15:34:40 2010 -0700" }, "message": "ip6mr: fix a typo in ip6mr_for_each_table()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72e09ad107e78d69ff4d3b97a69f0aad2b77280f", "tree": "daa8a97c230802bcbb8149a21172eca2c6155d91", "parents": [ "ca7335948e294faf8adf65f2c95ca18ea78540db" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Jun 05 03:03:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 05 03:03:30 2010 -0700" }, "message": "ipv6: avoid high order allocations\n\nWith mtu\u003d9000, mld_newpack() use order-2 GFP_ATOMIC allocations, that\nare very unreliable, on machines where PAGE_SIZE\u003d4K\n\nLimit allocated skbs to be at most one page. (order-0 allocations)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c44649216522cd607a4027d2ebf4a8147d3fa94c", "tree": "e46e153f3f3166353d9818e6b719f1c06b60d4be", "parents": [ "ca55158c6ecb7832a6ad80ac44a14d23bab8cdfc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 03 05:45:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:03 2010 -0700" }, "message": "tcp: use correct net ns in cookie_v4_check()\n\nIts better to make a route lookup in appropriate namespace.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca55158c6ecb7832a6ad80ac44a14d23bab8cdfc", "tree": "e701c78b85016247fa5962de0e0793e5b985930e", "parents": [ "536e00e570c87f258554e919c444b81a7002e46d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 03 09:03:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:02 2010 -0700" }, "message": "rps: tcp: fix rps_sock_flow_table table updates\n\nI believe a moderate SYN flood attack can corrupt RFS flow table\n(rps_sock_flow_table), making RPS/RFS much less effective.\n\nEven in a normal situation, server handling short lived sessions suffer\nfrom bad steering for the first data packet of a session, if another SYN\npacket is received for another session.\n\nWe do following action in tcp_v4_rcv() :\n\n\tsock_rps_save_rxhash(sk, skb-\u003erxhash);\n\nWe should _not_ do this if sk is a LISTEN socket, as about each\npacket received on a LISTEN socket has a different rxhash than\nprevious one.\n -\u003e RPS_NO_CPU markers are spread all over rps_sock_flow_table.\n\nAlso, it makes sense to protect sk-\u003erxhash field changes with socket\nlock (We currently can change it even if user thread owns the lock\nand might use rxhash)\n\nThis patch moves sock_rps_save_rxhash() to a sock locked section,\nand only for non LISTEN sockets.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57f1553ee5d9f093660cc49098f494e17ed11668", "tree": "95387158da48c4dde7bb17477f87944c13e2456f", "parents": [ "ca739481662137b8f717bc21f16719cda3c33d6b" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Thu Jun 03 00:42:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:01 2010 -0700" }, "message": "syncookies: remove Kconfig text line about disabled-by-default\n\nsyncookies default to on since\ne994b7c901ded7200b525a707c6da71f2cf6d4bb\n(tcp: Don\u0027t make syn cookies initial setting depend on CONFIG_SYSCTL).\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8764ab2ca7ab5055e1ca80f9cfa4970c34acb804", "tree": "ca0a6ea6c6fabbb98220f5b700981f7f23855f42", "parents": [ "4f4aeb7fd0f7e6ca008bb2147ba36cee13876595" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Fri Jun 04 01:57:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:00 2010 -0700" }, "message": "net: check for refcount if pop a stacked dst_entry\n\nxfrm triggers a warning if dst_pop() drops a refcount\non a noref dst. This patch changes dst_pop() to\nskb_dst_pop(). skb_dst_pop() drops the refcnt only\non a refcounted dst. Also we don\u0027t clone the child\ndst_entry, so it is not refcounted and we can use\nskb_dst_set_noref() in xfrm_output_one().\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b9a4e6e442756f670ef507f09bbc6c11dc0fca6", "tree": "bed171512423a88dda5125f76568d481acaaabb4", "parents": [ "56bf882230d2266a2e07b7f404dc96d157a65daa" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri May 28 15:22:58 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 04 15:50:51 2010 -0400" }, "message": "mac80211: process station blockack action frames from work\n\nProcessing an association response could take a bit\nof time while we set up the hardware etc. During that\ntime, the AP might already send a blockack request.\nIf this happens very quickly on a fairly slow machine,\nwe can end up processing the blockack request before\nthe association processing has finished. Since the\nblockack processing cannot sleep right now, we also\ncannot make it wait in the driver.\n\nAs a result, sometimes on slow machines the iwlagn\ndriver gets totally confused, and no traffic can pass\nwhen the aggregation setup was done before the assoc\nsetup completed.\n\nI\u0027m working on a proper fix for this, which involves\nqueuing all blockack category action frames from a\nwork struct, and also allowing the ampdu_action driver\ncallback to sleep, which will generally clean up the\ncode and make things easier.\n\nHowever, this is a very involved and complex change.\nTo fix the problem at hand in a way that can also be\nbackported to stable, I\u0027ve come up with this patch.\nHere, I simply process all aggregation action frames\nfrom the managed interface skb queue, which means\ntheir processing will be serialized with processing\nthe association response, thereby fixing the problem.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4f4aeb7fd0f7e6ca008bb2147ba36cee13876595", "tree": "48f77ea91413ac36fc6ce72bf15249da6586b04e", "parents": [ "a1868dc2878e61778b9d6d8c61d5368e51d68a29", "51a0d38de26226f2779912d92f155b93d539da9a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 12:30:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 12:30:58 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "db2c24175d149b55784f7cb2c303622ce962c1ae", "tree": "37c34d4289975bcea43d50bf6eff405f74310db5", "parents": [ "3df95ce948dc8ceef07b49003ab944aa047f2a79" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed Jun 02 04:55:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 03:28:27 2010 -0700" }, "message": "act_pedit: access skb-\u003edata safely\n\naccess skb-\u003edata safely\n\nwe should use skb_header_pointer() and skb_store_bits() to access skb-\u003edata to\nhandle small or non-linear skbs.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n net/sched/act_pedit.c | 24 ++++++++++++++----------\n 1 file changed, 14 insertions(+), 10 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fbc2e7d9cf49e0bf89b9e91fd60a06851a855c5d", "tree": "a82f11f0ea06fd465393314d0f37772f715c6caf", "parents": [ "edafe502404f3669d364b6e96d79b54067b634b4" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed Jun 02 07:32:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 07:32:42 2010 -0700" }, "message": "cls_u32: use skb_header_pointer() to dereference data safely\n\nuse skb_header_pointer() to dereference data safely\n\nthe original skb-\u003edata dereference isn\u0027t safe, as there isn\u0027t any skb-\u003elen or\nskb_is_nonlinear() check. skb_header_pointer() is used instead in this patch.\nAnd when the skb isn\u0027t long enough, we terminate the function u32_classify()\nimmediately with -1.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edafe502404f3669d364b6e96d79b54067b634b4", "tree": "ef3c1a3921e20b2dc40938f2de23e893a6a53c4a", "parents": [ "33c29dde7d04dc0ec0edb649d20ccf1351c13a06" ], "author": { "name": "Daniele Lacamera", "email": "root@danielinux.net", "time": "Wed Jun 02 02:02:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 07:15:48 2010 -0700" }, "message": "TCP: tcp_hybla: Fix integer overflow in slow start increment\n\nFor large values of rtt, 2^rho operation may overflow u32. Clamp down the increment to 2^16.\n\nSigned-off-by: Daniele Lacamera \u003croot@danielinux.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33c29dde7d04dc0ec0edb649d20ccf1351c13a06", "tree": "29c06e00942fc07554ebb918d7702d22eb8c7ff3", "parents": [ "e3fe8558c7fc182972c3d947d88744482111f304" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat May 29 14:26:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 06:51:34 2010 -0700" }, "message": "act_nat: fix the wrong checksum when addr isn\u0027t in old_addr/mask\n\nfix the wrong checksum when addr isn\u0027t in old_addr/mask\n\nFor TCP and UDP packets, when addr isn\u0027t in old_addr/mask we don\u0027t do SNAT or\nDNAT, and we should not update layer 4 checksum.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n net/sched/act_nat.c | 4 ++++\n 1 file changed, 4 insertions(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2df4a0fa1540c460ec69788ab2a901cc72a75644", "tree": "cf9fb32c112a2b27eaeccd8a825c15505b32e2d9", "parents": [ "194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed May 12 21:31:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 03:35:18 2010 -0700" }, "message": "net: fix conflict between null_or_orig and null_or_bond\n\nIf a skb is received on an inactive bond that does not meet\nthe special cases checked for by skb_bond_should_drop it should\nonly be delivered to exact matches as the comment in\nnetif_receive_skb() says.\n\nHowever because null_or_bond could also be null this is not\nalways true. This patch renames null_or_bond to orig_or_bond\nand initializes it to orig_dev. This keeps the intent of\nnull_or_bond to pass frames received on VLAN interfaces stacked\non bonding interfaces without invalidating the statement for\nnull_or_orig.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485", "tree": "fbfae006dc8400c82ce387f1f4e39b8488c00e31", "parents": [ "08f382ebb8a9efb898840aa74cf55148c7a98af6" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed May 12 21:31:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 03:35:18 2010 -0700" }, "message": "net: init_vlan should not copy slave or master flags\n\nThe vlan device should not copy the slave or master flags from\nthe real device. It is not in the bond until added nor is it\na master.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fafeeb6c80e3842c6dc19d05de09a23f23eef0d8", "tree": "47a177d76fa0833a324737e103d5128ad77b231b", "parents": [ "b42d9165e1e3d92e4e3318642463dbe592a12568" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 01 10:04:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 02:26:39 2010 -0700" }, "message": "xfrm: force a dst reference in __xfrm_route_forward()\n\nPackets going through __xfrm_route_forward() have a not refcounted dst\nentry, since we enabled a noref forwarding path.\n\nxfrm_lookup() might incorrectly release this dst entry.\n\nIt\u0027s a bit late to make invasive changes in xfrm_lookup(), so lets force\na refcount in this path.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "51a0d38de26226f2779912d92f155b93d539da9a", "tree": "9f74cc26000dcebf79c93081c9afa62b787895ff", "parents": [ "8ae5977ff95c03fe6c36a5721c57dcb4bfe4f290" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon May 31 12:00:12 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 01 14:33:02 2010 -0400" }, "message": "mac80211: fix dialog token allocator\n\nThe dialog token allocator has apparently been broken\nsince b83f4e15 (\"mac80211: fix deadlock in sta-\u003elock\")\nbecause it got moved out under the spinlock. Fix it.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8ae5977ff95c03fe6c36a5721c57dcb4bfe4f290", "tree": "f4817b7bfbc4011345cb7c163b2e95eaf6470490", "parents": [ "397f385bdba6cdf7752467a7ae81810340929e44" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Sun May 30 14:52:58 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 01 14:33:02 2010 -0400" }, "message": "mac80211: fix blockack-req processing\n\nDaniel reported that the paged RX changes had\nbroken blockack request frame processing due\nto using data that wasn\u0027t really part of the\nskb data.\n\nFix this using skb_copy_bits() for the needed\ndata. As a side effect, this adds a check on\nprocessing too short frames, which previously\nthis code could do.\n\nReported-by: Daniel Halperin \u003cdhalperi@cs.washington.edu\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nAcked-by: Daniel Halperin \u003cdhalperi@cs.washington.edu\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "288fcee8b7aa98796d96cd5b1b2e8005639328bf", "tree": "25a9b70411711a86de005f188d6d591c6fc196ad", "parents": [ "5953a303471951a4c2f2127f0b4c74df7ceb7ac2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon May 31 23:48:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:52:39 2010 -0700" }, "message": "net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG \u003e 1\n\nCommit: c720c7e8383aff1cb219bddf474ed89d850336e3 missed these.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5953a303471951a4c2f2127f0b4c74df7ceb7ac2", "tree": "13b51217a6f538fe5c72821b1ee65d9bfea72842", "parents": [ "b1faf5666438090a4dc4fceac8502edc7788b7e3", "7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:57 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "b1faf5666438090a4dc4fceac8502edc7788b7e3", "tree": "f90808dea27cc38aff6feed1782e2a5666fa6ee9", "parents": [ "bc284f94f84c3d76e49c6f3df9028c503f9589d9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 31 23:44:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:05 2010 -0700" }, "message": "net: sock_queue_err_skb() dont mess with sk_forward_alloc\n\nCorrect sk_forward_alloc handling for error_queue would need to use a\nbacklog of frames that softirq handler could not deliver because socket\nis owned by user thread. Or extend backlog processing to be able to\nprocess normal and error packets.\n\nAnother possibility is to not use mem charge for error queue, this is\nwhat I implemented in this patch.\n\nNote: this reverts commit 29030374\n(net: fix sk_forward_alloc corruptions), since we dont need to lock\nsocket anymore.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5", "tree": "fe2450679dc217183421e606b3912641545596bd", "parents": [ "c936e8bd1de2fa50c49e3df6fa5036bf07870b67" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 31 16:41:35 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 31 16:41:35 2010 +0200" }, "message": "netfilter: xtables: stackptr should be percpu\n\ncommit f3c5c1bfd4 (netfilter: xtables: make ip_tables reentrant)\nintroduced a performance regression, because stackptr array is shared by\nall cpus, adding cache line ping pongs. (16 cpus share a 64 bytes cache\nline)\n\nFix this using alloc_percpu()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-By: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c936e8bd1de2fa50c49e3df6fa5036bf07870b67", "tree": "41cbd0cad5110ad5fea36564e762a0693184cc05", "parents": [ "67a3e12b05e055c0415c556a315a3d3eb637e29e" ], "author": { "name": "Xiaotian Feng", "email": "dfeng@redhat.com", "time": "Mon May 31 16:41:09 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 31 16:41:09 2010 +0200" }, "message": "netfilter: don\u0027t xt_jumpstack_alloc twice in xt_register_table\n\nIn xt_register_table, xt_jumpstack_alloc is called first, later\nxt_replace_table is used. But in xt_replace_table, xt_jumpstack_alloc\nwill be used again. Then the memory allocated by previous xt_jumpstack_alloc\nwill be leaked. We can simply remove the previous xt_jumpstack_alloc because\nthere aren\u0027t any users of newinfo between xt_jumpstack_alloc and\nxt_replace_table.\n\nSigned-off-by: Xiaotian Feng \u003cdfeng@redhat.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nAcked-By: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "64960848abd18d0bcde3f53ffa7ed0b631e6b25d", "tree": "8424a1c550a98ce09f127425fde9b7b5f2f5027a", "parents": [ "2903037400a26e7c0cc93ab75a7d62abfacdf485", "67a3e12b05e055c0415c556a315a3d3eb637e29e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 05:46:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 05:46:45 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "2903037400a26e7c0cc93ab75a7d62abfacdf485", "tree": "c29d8b3199d8fa52856e5edcd374411f962d7c11", "parents": [ "7dfde179c38056b91d51e60f3d50902387f27c84" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat May 29 00:20:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 29 00:20:48 2010 -0700" }, "message": "net: fix sk_forward_alloc corruptions\n\nAs David found out, sock_queue_err_skb() should be called with socket\nlock hold, or we risk sk_forward_alloc corruption, since we use non\natomic operations to update this field.\n\nThis patch adds bh_lock_sock()/bh_unlock_sock() pair to three spots.\n(BH already disabled)\n\n1) skb_tstamp_tx() \n2) Before calling ip_icmp_error(), in __udp4_lib_err() \n3) Before calling ipv6_icmp_error(), in __udp6_lib_err()\n\nReported-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7dfde179c38056b91d51e60f3d50902387f27c84", "tree": "ca53c26f8290127f2199e387987c176402483a55", "parents": [ "97dc875f90a7b88a9fa476c256345c0d40fcdf6c" ], "author": { "name": "Rémi Denis-Courmont", "email": "remi.denis-courmont@nokia.com", "time": "Wed May 26 00:44:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 29 00:18:50 2010 -0700" }, "message": "Phonet: listening socket lock protects the connected socket list\n\nThe accept()\u0027d socket need to be unhashed while the (listen()\u0027ing)\nsocket lock is held. This fixes a race condition that could lead to an\nOOPS.\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97dc875f90a7b88a9fa476c256345c0d40fcdf6c", "tree": "53979f092d9f6792f44b940d70a9b9920316bfc5", "parents": [ "c196b02ce60d7b1f9bc62a62c5706d4d58fbfc5a" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed May 26 05:16:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 29 00:18:50 2010 -0700" }, "message": "caif: unlock on error path in cfserl_receive()\n\nThere was an spin_unlock missing on the error path. The spin_lock was\ntucked in with the declarations so it was hard to spot. I added a new\nline.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Sjur Brændeland \u003csjurbren@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5daf47bb4e708fde32c1856a0d049e3c3d03c36c", "tree": "422ee585ceb87822c7e8ae18208197d25e62e23a", "parents": [ "e72e9f3814cb8c1076d627c29cec90b005838ac3" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed May 26 05:54:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 29 00:18:48 2010 -0700" }, "message": "net/rds: Add missing mutex_unlock\n\nAdd a mutex_unlock missing on the error path. In each case, whenever the\nlabel out is reached from elsewhere in the function, mutex is not locked.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression E1;\n@@\n\n* mutex_lock(E1);\n \u003c+... when !\u003d E1\n if (...) {\n ... when !\u003d E1\n* return ...;\n }\n ...+\u003e\n* mutex_unlock(E1);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nReviewed-by: Zach Brown \u003czach.brown@oracle.com\u003e\nAcked-by: Andy Grover \u003candy.grover@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b0daa3474d52bed906c4d5e92b44e10148c6972", "tree": "3ed95111a3637d1b64f4c1bf27a0e86a785ca104", "parents": [ "6057fd78a8dcce6269f029b967051d5a2e9b0895" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat May 29 00:12:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 29 00:12:13 2010 -0700" }, "message": "skb: make skb_recycle_check() return a bool value\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6057fd78a8dcce6269f029b967051d5a2e9b0895", "tree": "4e7076b5790684068cf2f025d19fbac2b750cc7f", "parents": [ "e5e5cf4c71508ed38e921b31b438b8b349409f2a" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Fri May 28 23:02:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 23:02:35 2010 -0700" }, "message": "IPv6: fix Mobile IPv6 regression\n\nCommit f4f914b5 (net: ipv6 bind to device issue) caused\na regression with Mobile IPv6 when it changed the meaning\nof fl-\u003eoif to become a strict requirement of the route\nlookup. Instead, only force strict mode when\nsk-\u003esk_bound_dev_if is set on the calling socket, getting\nthe intended behavior and fixing the regression.\n\nTested-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5e5cf4c71508ed38e921b31b438b8b349409f2a", "tree": "1e5f57fb8adaae40746031c2bec77c986cbbc52b", "parents": [ "045de01a174d9f0734f657eb4b3313d89b4fd5ad", "da1fdb02d9200ff28b6f3a380d21930335fe5429" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 22:36:41 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 22:36:41 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "368a07d26ae99c80678a968946744fd83e7708d0", "tree": "40284ed5b7a683ce44f95e479fcd3c996090442e", "parents": [ "c6a6368b32aa4fd145e840c8d8dac6923fae2688" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Fri May 28 14:26:23 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 28 13:41:27 2010 -0400" }, "message": "mac80211: make a function static\n\nsparse correctly complains that\n__ieee80211_get_channel_mode is not static.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "72da3bc0cb3e82bd95f278a0c5c988e506e56d13", "tree": "db4bf9f9265be3216dfb3d65b49e53d8448e13e2", "parents": [ "8507bb0062bff1431bbcce921efe5cd1186fcff2", "045de01a174d9f0734f657eb4b3313d89b4fd5ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 28 10:18:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 28 10:18:40 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)\n netlink: bug fix: wrong size was calculated for vfinfo list blob\n netlink: bug fix: don\u0027t overrun skbs on vf_port dump\n xt_tee: use skb_dst_drop()\n netdev/fec: fix ifconfig eth0 down hang issue\n cnic: Fix context memory init. on 5709.\n drivers/net: Eliminate a NULL pointer dereference\n drivers/net/hamradio: Eliminate a NULL pointer dereference\n be2net: Patch removes redundant while statement in loop.\n ipv6: Add GSO support on forwarding path\n net: fix __neigh_event_send()\n vhost: fix the memory leak which will happen when memory_access_ok fails\n vhost-net: fix to check the return value of copy_to/from_user() correctly\n vhost: fix to check the return value of copy_to/from_user() correctly\n vhost: Fix host panic if ioctl called with wrong index\n net: fix lock_sock_bh/unlock_sock_bh\n net/iucv: Add missing spin_unlock\n net: ll_temac: fix checksum offload logic\n net: ll_temac: fix interrupt bug when interrupt 0 is used\n sctp: dubious bitfields in sctp_transport\n ipmr: off by one in __ipmr_fill_mroute()\n ...\n" }, { "commit": "045de01a174d9f0734f657eb4b3313d89b4fd5ad", "tree": "da3250d65f4851e11446af9df34152144914662d", "parents": [ "8ca9418350eccd5dd2659931807c1901224dd638" ], "author": { "name": "Scott Feldman", "email": "scofeldm@cisco.com", "time": "Fri May 28 03:42:43 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 03:42:43 2010 -0700" }, "message": "netlink: bug fix: wrong size was calculated for vfinfo list blob\n\nThe wrong size was being calculated for vfinfo. In one case, it was over-\ncalculating using nlmsg_total_size on attrs, in another case, it was\nunder-calculating by assuming ifla_vf_* structs are packed together, but\neach struct is it\u0027s own attr w/ hdr (and padding).\n\nSigned-off-by: Scott Feldman \u003cscofeldm@cisco.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ca9418350eccd5dd2659931807c1901224dd638", "tree": "2b476e5a084de1da3cb68dbddcce80c0c917578a", "parents": [ "50636af715ac1ceb1872bd29a4bdcc68975c3263" ], "author": { "name": "Scott Feldman", "email": "scofeldm@cisco.com", "time": "Fri May 28 03:42:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 03:42:18 2010 -0700" }, "message": "netlink: bug fix: don\u0027t overrun skbs on vf_port dump\n\nNoticed by Patrick McHardy: was continuing to fill skb after a\nnla_put_failure, ignoring the size calculated by upper layer. Now,\nreturn -EMSGSIZE on any overruns, but also allow netdev to\nfail ndo_get_vf_port with error other than -EMSGSIZE, thus unwinding\nnest.\n\nSigned-off-by: Scott Feldman \u003cscofeldm@cisco.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "50636af715ac1ceb1872bd29a4bdcc68975c3263", "tree": "55e45cff7af6aa1fcacef7803556f6f9a14e7f4c", "parents": [ "418bd0d4dfbff25ffe4365ddd3e7cba8c70ccba8" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri May 28 03:41:17 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 03:41:17 2010 -0700" }, "message": "xt_tee: use skb_dst_drop()\n\nAfter commit 7fee226a (net: add a noref bit on skb dst), its wrong to\nuse : dst_release(skb_dst(skb)), since we could decrement a refcount\nwhile skb dst was not refcounted.\n\nWe should use skb_dst_drop(skb) instead.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0aa68271510ae2b221d4b60892103837be63afe4", "tree": "f6d6a624a13ced851ea3036995813b1612200e01", "parents": [ "a47311380e094bb201be8a818370c73c3f52122c" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu May 27 16:14:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 01:57:17 2010 -0700" }, "message": "ipv6: Add GSO support on forwarding path\n\nCurrently we disallow GSO packets on the IPv6 forward path.\nThis patch fixes this.\n\nNote that I discovered that our existing GSO MTU checks (e.g.,\nIPv4 forwarding) are buggy in that they skip the check altogether,\nwhen they really should be checking gso_size + header instead.\n\nI have also been lazy here in that I haven\u0027t bothered to segment\nthe GSO packet by hand before generating an ICMP message. Someone\nshould add that to be 100% correct.\n\nReported-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a47311380e094bb201be8a818370c73c3f52122c", "tree": "da4eb4607fece39b9cdb03fb69792e44a914d2bd", "parents": [ "a02c37891a9b2d7ce93f9d09455b4f67c4c23b95" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 27 16:09:39 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 01:57:16 2010 -0700" }, "message": "net: fix __neigh_event_send()\n\ncommit 7fee226ad23 (net: add a noref bit on skb dst) missed one spot\nwhere an skb is enqueued, with a possibly not refcounted dst entry.\n\n__neigh_event_send() inserts skb into arp_queue, so we must make sure\ndst entry is refcounted, or dst entry can be freed by garbage collector\nafter caller exits from rcu protected section.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9", "tree": "40d5e99660c77c5791392d349a93113c044dbf14", "parents": [ "cad719d86e9dbd06634eaba6401e022c8101d6b2", "49c177461bfbedeccbab22bf3905db2f9da7f1c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 15:23:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 15:23:47 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (61 commits)\n tracing: Add __used annotation to event variable\n perf, trace: Fix !x86 build bug\n perf report: Support multiple events on the TUI\n perf annotate: Fix up usage of the build id cache\n x86/mmiotrace: Remove redundant instruction prefix checks\n perf annotate: Add TUI interface\n perf tui: Remove annotate from popup menu after failure\n perf report: Don\u0027t start the TUI if -D is used\n perf: Fix getline undeclared\n perf: Optimize perf_tp_event_match()\n perf: Remove more code from the fastpath\n perf: Optimize the !vmalloc backed buffer\n perf: Optimize perf_output_copy()\n perf: Fix wakeup storm for RO mmap()s\n perf-record: Share per-cpu buffers\n perf-record: Remove -M\n perf: Ensure that IOC_OUTPUT isn\u0027t used to create multi-writer buffers\n perf, trace: Optimize tracepoints by using per-tracepoint-per-cpu hlist to track events\n perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction\n perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig\n ...\n" }, { "commit": "ade61088bc77dd209f8edadbe544f1e5dad6c287", "tree": "50a2eb0b78a470f379801a5abc73ff822f1e47c0", "parents": [ "7eb1053fd00a8f0e2263697638e17da8a251aa74", "0522f6adedd2736cbca3c0e16ca51df668993eee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 10:18:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 10:18:44 2010 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Fix another nfs_wb_page() deadlock\n NFS: Ensure that we mark the inode as dirty if we exit early from commit\n NFS: Fix a lock imbalance typo in nfs_access_cache_shrinker\n sunrpc: fix leak on error on socket xprt setup\n" }, { "commit": "92e99a98bb44ccce6c902ea077b49cafcfb80025", "tree": "f6bc31148c2c9358b775b4eb2219c3fe2ba582f9", "parents": [ "eac4068013a067f5fb63005033c13b27fbf6dfca" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed May 26 14:43:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:48 2010 -0700" }, "message": "iucv: convert cpu notifier to return encapsulate errno value\n\nBy the previous modification, the cpu notifier can return encapsulate\nerrno value. This converts the cpu notifiers for iucv.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Ursula Braun \u003cursula.braun@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "8a74ad60a546b13bd1096b2a61a7a5c6fd9ae17c" }