1. 03 Nov, 2012 4 commits
  2. 01 Nov, 2012 13 commits
  3. 31 Oct, 2012 4 commits
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · aff9c786
      David S. Miller authored
      
      
      John W. Linville says:
      
      ====================
      This is a batch of fixes intended for 3.7...
      
      The biggest portion of this is a pull request from Johannes Berg:
      
      "Please pull my mac80211.git tree per below to get a number of fixes. I
      have included a patch from Antonio to fix a memcpy overrun, Felix's
      patches for the antenna gain/tx power issues, a few mesh-related fixes
      from Javier for mac80211 and my own patches to not access data that
      might not be present in an skb at all as well as a patch (the duplicate
      IE check one) to make mac80211 forward-compatible with potential future
      spec extensions that use the same IE multiple times.
      
      It's a bit bigger than I'd like maybe, but I think all of these are
      worthwhile fixes at this point."
      
      In addition...
      
      Felix Fietkau fixes an ath9k use-after-free issue.
      
      Stanislaw Gruszka adds a valid value check to rt2800.
      
      Sven Eckelmann adds a check to only check a TID value in a BlockAck, for
      frames that could be either a BlockAck or a normal Ack.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aff9c786
    • David S. Miller's avatar
      Merge branch 'master' of git://1984.lsi.us.es/nf · f8450bbe
      David S. Miller authored
      
      
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains fixes for your net tree, two of them
      are due to relatively recent changes, one has been a longstanding bug,
      they are:
      
      * Fix incorrect usage of rt_gateway in the H.323 helper, from
        Julian Anastasov.
      
      * Skip re-route in nf_nat code for ICMP traffic. If CONFIG_XFRM is
        enabled, we waste cycles to look up for the route again. This problem
        seems to be there since really long time. From Ulrich Weber.
      
      * Fix mismatching section in nf_conntrack_reasm, from Hein Tibosch.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f8450bbe
    • stephen hemminger's avatar
      vxlan: don't expire permanent entries · 3c172868
      stephen hemminger authored
      
      
      VXLAN confused flag versus bitmap on state.
      Based on part of a earlier patch by David Stevens.
      
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3c172868
    • John W. Linville's avatar
      Merge branch 'master' of... · 06272911
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      06272911
  4. 30 Oct, 2012 2 commits
  5. 29 Oct, 2012 2 commits
  6. 28 Oct, 2012 2 commits
  7. 26 Oct, 2012 13 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e657e078
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "This is what we usually expect at this stage of the game, lots of
        little things, mostly in drivers.  With the occasional 'oops didn't
        mean to do that' kind of regressions in the core code."
      
       1) Uninitialized data in __ip_vs_get_timeouts(), from Arnd Bergmann
      
       2) Reject invalid ACK sequences in Fast Open sockets, from Jerry Chu.
      
       3) Lost error code on return from _rtl_usb_receive(), from Christian
          Lamparter.
      
       4) Fix reset resume on USB rt2x00, from Stanislaw Gruszka.
      
       5) Release resources on error in pch_gbe driver, from Veaceslav Falico.
      
       6) Default hop limit not set correctly in ip6_template_metrics[], fix
          from Li RongQing.
      
       7) Gianfar PTP code requests wrong kind of resource during probe, fix
          from Wei Yang.
      
       8) Fix VHOST net driver on big-endian, from Michael S Tsirkin.
      
       9) Mallenox driver bug fixes from Jack Morgenstein, Or Gerlitz, Moni
          Shoua, Dotan Barak, and Uri Habusha.
      
      10) usbnet leaks memory on TX path, fix from Hemant Kumar.
      
      11) Use socket state test, rather than presence of FIN bit packet, to
          determine FIONREAD/SIOCINQ value.  Fix from Eric Dumazet.
      
      12) Fix cxgb4 build failure, from Vipul Pandya.
      
      13) Provide a SYN_DATA_ACKED state to complement SYN_FASTOPEN in socket
          info dumps.  From Yuchung Cheng.
      
      14) Fix leak of security path in kfree_skb_partial().  Fix from Eric
          Dumazet.
      
      15) Handle RX FIFO overflows more resiliently in pch_gbe driver, from
          Veaceslav Falico.
      
      16) Fix MAINTAINERS file pattern for networking drivers, from Jean
          Delvare.
      
      17) Add iPhone5 IDs to IPHETH driver, from Jay Purohit.
      
      18) VLAN device type change restriction is too strict, and should not
          trigger for the automatically generated vlan0 device.  Fix from Jiri
          Pirko.
      
      19) Make PMTU/redirect flushing work properly again in ipv4, from
          Steffen Klassert.
      
      20) Fix memory corruptions by using kfree_rcu() in netlink_release().
          From Eric Dumazet.
      
      21) More qmi_wwan device IDs, from Bjørn Mork.
      
      22) Fix unintentional change of SNAT/DNAT hooks in generic NAT
          infrastructure, from Elison Niven.
      
      23) Fix 3.6.x regression in xt_TEE netfilter module, from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (57 commits)
        tilegx: fix some issues in the SW TSO support
        qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan
        net: usb: Fix memory leak on Tx data path
        net/mlx4_core: Unmap UAR also in the case of error flow
        net/mlx4_en: Don't use vlan tag value as an indication for vlan presence
        net/mlx4_en: Fix double-release-range in tx-rings
        bas_gigaset: fix pre_reset handling
        vhost: fix mergeable bufs on BE hosts
        gianfar_ptp: use iomem, not ioports resource tree in probe
        ipv6: Set default hoplimit as zero.
        NET_VENDOR_TI: make available for am33xx as well
        pch_gbe: fix error handling in pch_gbe_up()
        b43: Fix oops on unload when firmware not found
        mwifiex: clean up scan state on error
        mwifiex: return -EBUSY if specific scan request cannot be honored
        brcmfmac: fix potential NULL dereference
        Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"
        ath9k_htc: Add PID/VID for a Ubiquiti WiFiStation
        rt2x00: usb: fix reset resume
        rtlwifi: pass rx setup error code to caller
        ...
      e657e078
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · f761237e
      Linus Torvalds authored
      Pull slave-dmaengine fixes from Vinod Koul:
       "Three fixes for slave dmanegine.
      
        Two are for typo omissions in sifr dmaengine driver and the last one
        is for the imx driver fixing a missing unlock"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: sirf: fix a typo in moving running dma_desc to active queue
        dmaengine: sirf: fix a typo in dma_prep_interleaved
        dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
      f761237e
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-for-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 64b1cbaa
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael J Wysocki:
      
       - Fix for a memory leak in acpi_bind_one() from Jesper Juhl.
      
       - Fix for an error code path memory leak in pm_genpd_attach_cpuidle()
         from Jonghwan Choi.
      
       - Fix for smp_processor_id() usage in preemptible code in powernow-k8
         from Andreas Herrmann.
      
       - Fix for a suspend-related memory leak in cpufreq stats from Xiaobing
         Tu.
      
       - Freezer fix for failure to clear PF_NOFREEZE along with PF_KTHREAD in
         flush_old_exec() from Oleg Nesterov.
      
       - acpi_processor_notify() fix from Alan Cox.
      
      * tag 'pm+acpi-for-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: missing break
        freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD
        Fix memory leak in cpufreq stats.
        cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
        PM / Domains: Fix memory leak on error path in pm_genpd_attach_cpuidle
        ACPI: Fix memory leak in acpi_bind_one()
      64b1cbaa
    • Johannes Berg's avatar
      mac80211: make sure data is accessible in EAPOL check · 6dbda2d0
      Johannes Berg authored
      
      
      The code to allow EAPOL frames even when the station
      isn't yet marked associated needs to check that the
      incoming frame is long enough and due to paged RX it
      also can't assume skb->data contains the right data,
      it must use skb_copy_bits(). Fix this to avoid using
      data that doesn't really exist.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      6dbda2d0
    • Johannes Berg's avatar
      mac80211: verify that skb data is present · 9b395bc3
      Johannes Berg authored
      
      
      A number of places in the mesh code don't check that
      the frame data is present and in the skb header when
      trying to access. Add those checks and the necessary
      pskb_may_pull() calls. This prevents accessing data
      that doesn't actually exist.
      
      To do this, export ieee80211_get_mesh_hdrlen() to be
      able to use it in mac80211.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      9b395bc3
    • Johannes Berg's avatar
      mac80211: check management frame header length · 4a4f1a58
      Johannes Berg authored
      
      
      Due to pskb_may_pull() checking the skb length, all
      non-management frames are checked on input whether
      their 802.11 header is fully present. Also add that
      check for management frames and remove a check that
      is now duplicate. This prevents accessing skb data
      beyond the frame end.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      4a4f1a58
    • Johannes Berg's avatar
      wireless: drop invalid mesh address extension frames · 7dd111e8
      Johannes Berg authored
      
      
      The mesh header can have address extension by a 4th
      or a 5th and 6th address, but never both. Drop such
      frames in 802.11 -> 802.3 conversion along with any
      frames that have the wrong extension.
      
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarJavier Cardona <javier@cozybit.com>
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      7dd111e8
    • Antonio Quartulli's avatar
      mac80211: fix SSID copy on IBSS JOIN · badecb00
      Antonio Quartulli authored
      
      
      The 'ssid' field of the cfg80211_ibss_params is a u8 pointer and
      its length is likely to be less than IEEE80211_MAX_SSID_LEN most
      of the time.
      
      This patch fixes the ssid copy in ieee80211_ibss_join() by using
      the SSID length to prevent it from reading beyond the string.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
      [rewrapped commit message, small rewording]
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      badecb00
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f54c77dd
      Linus Torvalds authored
      Pull infiniband fixes from Roland Dreier:
       "Small batch of fixes for 3.7:
         - Fix crash in error path in cxgb4
         - Fix build error on 32 bits in mlx4
         - Fix SR-IOV bugs in mlx4"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        mlx4_core: Perform correct resource cleanup if mlx4_QUERY_ADAPTER() fails
        mlx4_core: Remove annoying debug messages from SR-IOV flow
        RDMA/cxgb4: Don't free chunk that we have failed to allocate
        IB/mlx4: Synchronize cleanup of MCGs in MCG paravirtualization
        IB/mlx4: Fix QP1 P_Key processing in the Primary Physical Function (PPF)
        IB/mlx4: Fix build error on platforms where UL is not 64 bits
      f54c77dd
    • Linus Torvalds's avatar
      Merge tag 'usb-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1d47091a
      Linus Torvalds authored
      
      
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a bunch of USB fixes for the 3.7-rc tree.
      
        There's a lot of small USB serial driver fixes, and one larger one
        (the mos7840 driver changes are mostly just moving code around to fix
        problems.) Thanks to Johan Hovold for finding the problems and fixing
        them all up.
      
        Other than those, there is the usual new device ids, xhci bugfixes,
        and gadget driver fixes, nothing out of the ordinary.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'usb-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (49 commits)
        xhci: trivial: Remove assigned but unused ep_ctx.
        xhci: trivial: Remove assigned but unused slot_ctx.
        xhci: Fix missing break in xhci_evaluate_context_result.
        xhci: Fix potential NULL ptr deref in command cancellation.
        ehci: Add yet-another Lucid nohandoff pci quirk
        ehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions
        USB: mos7840: fix port_probe flow
        USB: mos7840: fix port-data memory leak
        USB: mos7840: remove invalid disconnect handling
        USB: mos7840: remove NULL-urb submission
        USB: qcserial: fix interface-data memory leak in error path
        USB: option: fix interface-data memory leak in error path
        USB: ipw: fix interface-data memory leak in error path
        USB: mos7840: fix port-device leak in error path
        USB: mos7840: fix urb leak at release
        USB: sierra: fix port-data memory leak
        USB: sierra: fix memory leak in probe error path
        USB: sierra: fix memory leak in attach error path
        USB: usb-wwan: fix multiple memory leaks in error paths
        USB: keyspan: fix NULL-pointer dereferences and memory leaks
        ...
      1d47091a
    • Linus Torvalds's avatar
      Merge tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 6ad2c73d
      Linus Torvalds authored
      
      
      Pull serial fix from Greg Kroah-Hartman:
       "Here is one patch, a revert of a omap serial driver patch that was
        causing problems, for your 3.7-rc tree.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "serial: omap: fix software flow control"
      6ad2c73d
    • Linus Torvalds's avatar
      Merge tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 490916d6
      Linus Torvalds authored
      
      
      Pull staging driver fixes from Greg Kroah-Hartman:
       "Here are some staging driver fixes for your 3.7-rc tree.
      
        Nothing major here, a number of iio driver fixups that were causing
        problems, some comedi driver bugfixes, and a bunch of tidspbridge
        warning squashing and other regressions fixed from the 3.6 release.
      
        All have been in the linux-next releases for a bit.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (32 commits)
        staging: tidspbridge: delete unused mmu functions
        staging: tidspbridge: ioremap physical address of the stack segment in shm
        staging: tidspbridge: ioremap dsp sync addr
        staging: tidspbridge: change type to __iomem for per and core addresses
        staging: tidspbridge: drop const from custom mmu implementation
        staging: tidspbridge: request the right irq for mmu
        staging: ipack: add missing include (implicit declaration of function 'kfree')
        staging: ramster: depends on NET
        staging: omapdrm: fix allocation size for page addresses array
        staging: zram: Fix handling of incompressible pages
        Staging: android: binder: Allow using highmem for binder buffers
        Staging: android: binder: Fix memory leak on thread/process exit
        staging: comedi: ni_labpc: fix possible NULL deref during detach
        staging: comedi: das08: fix possible NULL deref during detach
        staging: comedi: amplc_pc263: fix possible NULL deref during detach
        staging: comedi: amplc_pc236: fix possible NULL deref during detach
        staging: comedi: amplc_pc236: fix invalid register access during detach
        staging: comedi: amplc_dio200: fix possible NULL deref during detach
        staging: comedi: 8255_pci: fix possible NULL deref during detach
        staging: comedi: ni_daq_700: fix dio subdevice regression
        ...
      490916d6
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 299650ca
      Linus Torvalds authored
      
      
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are a number of firmware core fixes for 3.7, and some other minor
        fixes.  And some documentation updates thrown in for good measure.
      
        All have been in the linux-next tree for a while.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'driver-core-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        Documentation:Chinese translation of Documentation/arm64/memory.txt
        Documentation:Chinese translation of Documentation/arm64/booting.txt
        Documentation:Chinese translation of Documentation/IRQ.txt
        firmware loader: document kernel direct loading
        sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
        dynamic_debug: Remove unnecessary __used
        firmware loader: sync firmware cache by async_synchronize_full_domain
        firmware loader: let direct loading back on 'firmware_buf'
        firmware loader: fix one reqeust_firmware race
        firmware loader: cancel uncache work before caching firmware
      299650ca