1. 20 Sep, 2013 26 commits
  2. 19 Sep, 2013 14 commits
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7b9e3a6a
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A set of fixes for ARM platforms for 3.12.  Among them:
         - A fix for build breakage in the MTD subsystem for some PXA devices.
           David Woodhouse has this patch in his for-next branch but has not
           been responding to our requests to send it up so here it is.  I
           should have amended the commit message to describe the build
           failure for CONFIG_OF=n setups, but forgot and now it's down in the
           stack of commits.
         - Added device-tree for the BeagleBone Black.  Turns out people have
           been using the older "regualar" bone DT for the newer boards, and
           there's risk of damaging hardware that way.
         - Misc DT and regular fixes for OMAP.
         - Fix to make the ST-Ericsson "snowball" boards boot with
           multi_v7_defconfig, and enable one of the ST-E reference boards on
           the same config.
         - Kconfig cleanup for u300 to hide submenus when the platform isn't
         - Enable ARM_ATAG_DTB_COMPAT to let firmware override command line
           when booting with an appended devicetree on non-DT-enabled firmware
           (needed to boot snowball)"
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
        ARM: multi_v7: add HREFv60 to multi_v7 defconfig
        ARM: OMAP2+: mux: fix trivial typo in name
        ARM: OMAP4 SMP: Corrected a typo fucntions to functions
        ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
        mailbox: remove unnecessary platform_set_drvdata()
        ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
        ARM: OMAP: fix return value check in omap_device_build_from_dt()
        ARM: OMAP4: Fix clock_get error for GPMC during boot
        ARM: sa1100: collie.c: fall back to jedec_probe flash detection
        ARM: u300: hide submenus
        ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
        ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
        ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
        mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF
        ARM: multi_v7_defconfig: enable ARM_ATAG_DTB_COMPAT
        ARM: ux500: disable outer cache debug
        ARM: dts: OMAP5: fix ocp2scp DTS data
        ARM: dts: OMAP5: fix reg property size
        ARM: dts: am335x-bone*: add DT for BeagleBone Black
        ARM: dts: omap3-beagle-xm: fix string error in compatible property
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b75ff5e8
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       1) If the local_df boolean is set on an SKB we have to allocate a
          unique ID even if IP_DF is set in the ipv4 headers, from Ansis
       2) Some fixups for the new chipset support that went into the sfc
          driver, from Ben Hutchings.
       3) Because SCTP bypasses a good chunk of, and actually duplicates, the
          logic of the ipv6 output path, some IPSEC things don't get done
          properly.  Integrate SCTP better into the ipv6 output path so that
          these problems are fixed and such issues don't get missed in the
          future either.  From Daniel Borkmann.
       4) Fix skge regressions added by the DMA mapping error return checking
          added in v3.10, from Mikulas Patocka.
       5) Kill some more IRQF_DISABLED references, from Michael Opdenacker.
       6) Fix races and deadlocks in the bridging code, from Hong Zhiguo.
       7) Fix error handling in tun_set_iff(), in particular don't leak
          resources.  From Jason Wang.
       8) Prevent format-string injection into xen-netback driver, from Kees
       9) Fix regression added to netpoll ARP packet handling, in particular
          check for the right ETH_P_ARP protocol code.  From Sonic Zhang.
      10) Try to deal with AMD IOMMU errors when using r8169 chips, from
          Francois Romieu.
      11) Cure freezes due to recent changes in the rt2x00 wireless driver,
          from Stanislaw Gruszka.
      12) Don't do SPI transfers (which can sleep) in interrupt context in
          cw1200 driver, from Solomon Peachy.
      13) Fix LEDs handling bug in 5720 tg3 chips already handled for 5719.
          From Nithin Sujir.
      14) Make xen_netbk_count_skb_slots() count the actual number of slots
          that will be used, taking into consideration packing and other
          issues that the transmit path will run into.  From David Vrabel.
      15) Use the correct maximum age when calculating the bridge
          message_age_timer, from Chris Healy.
      16) Get rid of memory leaks in mcs7780 IRDA driver, from Alexey
      17) Netfilter conntrack extensions were converted to RCU but are not
          always freed properly using kfree_rcu().  Fix from Michal Kubecek.
      18) VF reset recovery not being done correctly in qlcnic driver, from
          Manish Chopra.
      19) Fix inverted test in ATM nicstar driver, from Andy Shevchenko.
      20) Missing workqueue destroy in cxgb4 error handling, from Wei Yang.
      21) Internal switch not initialized properly in bgmac driver, from Rafał
      22) Netlink messages report wrong local and remote addresses in IPv6
          tunneling, from Ding Zhi.
      23) ICMP redirects should not generate socket errors in DCCP and SCTP.
          We're still working out how this should be handled for RAW and UDP
          sockets.  From Daniel Borkmann and Duan Jiong.
      24) We've had several bugs wherein the network namespace's loopback
          device gets accessed after it is free'd, NULL it out so that we can
          catch these problems more readily.  From Eric W Biederman.
      25) Fix regression in TCP RTO calculations, from Neal Cardwell.
      26) Fix too early free of xen-netback network device when VIFs still
          exist.  From Paul Durrant.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits)
        netconsole: fix a deadlock with rtnl and netconsole's mutex
        netpoll: fix NULL pointer dereference in netpoll_cleanup
        skge: fix broken driver
        ip: generate unique IP identificator if local fragmentation is allowed
        ip: use ip_hdr() in __ip_make_skb() to retrieve IP header
        xen-netback: Don't destroy the netdev until the vif is shut down
        net:dccp: do not report ICMP redirects to user space
        cnic: Fix crash in cnic_bnx2x_service_kcq()
        bnx2x, cnic, bnx2i, bnx2fc: Fix bnx2i and bnx2fc regressions.
        vxlan: Avoid creating fdb entry with NULL destination
        tcp: fix RTO calculated from cached RTT
        drivers: net: phy: cicada.c: clears warning Use #include <linux/io.h> instead of <asm/io.h>
        net loopback: Set loopback_dev to NULL when freed
        batman-adv: set the TAG flag for the vid passed to BLA
        netfilter: nfnetlink_queue: use network skb for sequence adjustment
        net: sctp: rfc4443: do not report ICMP redirects to user space
        net: usb: cdc_ether: use usb.h macros whenever possible
        net: usb: cdc_ether: fix checkpatch errors and warnings
        net: usb: cdc_ether: Use wwan interface for Telit modules
        ip6_tunnels: raddr and laddr are inverted in nl msg
    • Nikolay Aleksandrov's avatar
      netconsole: fix a deadlock with rtnl and netconsole's mutex · c71380ff
      Nikolay Aleksandrov authored
      This bug was introduced by commit
      7a163bfb ("netconsole: avoid a crash with
      multiple sysfs writers"). In store_enabled() we have the following
      sequence: acquire nt->mutex then rtnl, but in the netconsole netdev
      notifier we have rtnl then nt->mutex effectively leading to a deadlock.
      The NULL pointer dereference that the above commit tries to fix is
      actually due to another bug in netpoll_cleanup(). This is fixed by dropping
      the mutex from the netdev notifier as it's already protected by rtnl.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Nikolay Aleksandrov's avatar
      netpoll: fix NULL pointer dereference in netpoll_cleanup · d0fe8c88
      Nikolay Aleksandrov authored
      I've been hitting a NULL ptr deref while using netconsole because the
      np->dev check and the pointer manipulation in netpoll_cleanup are done
      without rtnl and the following sequence happens when having a netconsole
      over a vlan and we remove the vlan while disabling the netconsole:
      	CPU 1					CPU2
      					removes vlan and calls the notifier
      enters store_enabled(), calls
      netdev_cleanup which checks np->dev
      and then waits for rtnl
      					executes the netconsole netdev
      					release notifier making np->dev
      					== NULL and releases rtnl
      continues to dereference a member of
      np->dev which at this point is == NULL
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Mikulas Patocka's avatar
      skge: fix broken driver · c194992c
      Mikulas Patocka authored
      The patch 136d8f37 broke the skge driver.
      Note this part of the patch:
      +               if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
      +                       dev_kfree_skb(nskb);
      +                       goto resubmit;
      +               }
                                       dma_unmap_addr(e, mapaddr),
                                       dma_unmap_len(e, maplen),
                      skb = e->skb;
      -               skge_rx_setup(skge, e, nskb, skge->rx_buf_size);
      The function skge_rx_setup modifies e->skb to point to the new skb. Thus,
      after this change, the new buffer, not the old, is returned to the
      networking stack.
      This bug is present in kernels 3.11, 3.11.1 and 3.12-rc1. The patch should
      be queued for 3.11-stable.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Reported-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Reported-by: default avatarVasiliy Glazov <vascom2@gmail.com>
      Tested-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Ansis Atteka's avatar
      ip: generate unique IP identificator if local fragmentation is allowed · 703133de
      Ansis Atteka authored
      If local fragmentation is allowed, then ip_select_ident() and
      ip_select_ident_more() need to generate unique IDs to ensure
      correct defragmentation on the peer.
      For example, if IPsec (tunnel mode) has to encrypt large skbs
      that have local_df bit set, then all IP fragments that belonged
      to different ESP datagrams would have used the same identificator.
      If one of these IP fragments would get lost or reordered, then
      peer could possibly stitch together wrong IP fragments that did
      not belong to the same datagram. This would lead to a packet loss
      or data corruption.
      Signed-off-by: default avatarAnsis Atteka <aatteka@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Ansis Atteka's avatar
      ip: use ip_hdr() in __ip_make_skb() to retrieve IP header · 749154aa
      Ansis Atteka authored
      skb->data already points to IP header, but for the sake of
      consistency we can also use ip_hdr() to retrieve it.
      Signed-off-by: default avatarAnsis Atteka <aatteka@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Paul Durrant's avatar
      xen-netback: Don't destroy the netdev until the vif is shut down · 279f438e
      Paul Durrant authored
      Without this patch, if a frontend cycles through states Closing
      and Closed (which Windows frontends need to do) then the netdev
      will be destroyed and requires re-invocation of hotplug scripts
      to restore state before the frontend can move to Connected. Thus
      when udev is not in use the backend gets stuck in InitWait.
      With this patch, the netdev is left alone whilst the backend is
      still online and is only de-registered and freed just prior to
      destroying the vif (which is also nicely symmetrical with the
      netdev allocation and registration being done during probe) so
      no re-invocation of hotplug scripts is required.
      Signed-off-by: default avatarPaul Durrant <paul.durrant@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Acked-by: default avatarWei Liu <wei.liu2@citrix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · f05f8198
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       - Minor updates and fixes to the Octeon ethernet driver in staging
       - A fix to VGA_MAP_MEM() for 64 bit platforms
       - Fix a workaround for 74K/1074K processors
       - The symlink arch/mips/boot/dts/include/dt-bindings was pointing to a
         a file with a name ending in \n.  I think this may have been caused
         by a git bug with with patches sent by email
       - A build fix for VGA console on BCM1480-based systems
       - Fix PCI device access via "/sys/bus/pci/.../resource0" or similar
         work for Alchemy platforms
       - Fix potential data leak on MIPS R5 cores.  This doesn't add proper
         support for any R5 features, just ensures a kernel without such
         support will be secure to run
       - Adding a macros for the CP0 Config5 register to be used by the R5 fix
       - Make get_cycles() actually return something useful where possible
         This also requires a preparatory patch for performance sake
       - Fix a warning about the use of smp_processor_id() in preemptible
         code.  Again this includes a preparatory patch adding the
         infrastructure to be used by the actual patch
       - Finally remove pointless one-line comment
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Fix invalid symbolic link file
        MIPS: PCI: pci-bcm1480: Include missing vt.h header
        MIPS: Disable usermode switching of the FR bit for MIPS R5 CPUs.
        MIPS: Add MIPS R5 config5 register.
        MIPS: PCI: Use pci_resource_to_user to map pci memory space properly
        MIPS: 74K/1074K: Correct erratum workaround.
        MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks
        MIPS: Remove useless comment about kprobe from arch/mips/Makefile
        MIPS: Fix VGA_MAP_MEM macro.
        MIPS: Reimplement get_cycles().
        MIPS: Optimize current_cpu_type() for better code.
        MIPS: Fix accessing to per-cpu data when flushing the cache
        MIPS: Provide nice way to access boot CPU's data.
        staging: octeon-ethernet: rgmii: enable interrupts that we can handle
        staging: octeon-ethernet: remove skb alloc failure warnings
        staging: octeon-ethernet: make dropped packets to consume NAPI budget
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · e9ff04dd
      Linus Torvalds authored
      Pull ceph fixes from Sage Weil:
       "These fix several bugs with RBD from 3.11 that didn't get tested in
        time for the merge window: some error handling, a use-after-free, and
        a sequencing issue when unmapping and image races with a notify
        There is also a patch fixing a problem with the new ceph + fscache
        code that just went in"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        fscache: check consistency does not decrement refcount
        rbd: fix error handling from rbd_snap_name()
        rbd: ignore unmapped snapshots that no longer exist
        rbd: fix use-after free of rbd_dev->disk
        rbd: make rbd_obj_notify_ack() synchronous
        rbd: complete notifies before cleaning up osd_client and rbd_dev
        libceph: add function to ensure notifies are complete
    • Madhavan Srinivasan's avatar
      MIPS: Fix invalid symbolic link file · 66b10574
      Madhavan Srinivasan authored
      Commit 3b29aa5b [MIPS: add <dt-bindings/> symlink] created a symlink
      file in include/dt-bindings.  Even though commit diff is fine, the symlink
      is invalid and ls -lb shows a newline character at the end of the filename:
      lrwxrwxrwx 1 maddy maddy 35 Sep 19 18:11 dt-bindings ->
      Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
      Cc: steven.hill@imgtec.com
      Cc: mmarek@suse.cz
      Cc: swarren@nvidia.com
      Cc: linux-mips@linux-mips.org
      Cc: linux-kbuild@vger.kernel.org
      Cc: james.hogan@imgtec.com
      Patchwork: https://patchwork.linux-mips.org/patch/5859/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    • Markos Chandras's avatar
      MIPS: PCI: pci-bcm1480: Include missing vt.h header · 88f02518
      Markos Chandras authored
      It's needed for the MAX_NR_CONSOLES macro.
      Fixes the following build problem on a randconfig:
      arch/mips/pci/pci-bcm1480.c: In function 'bcm1480_pcibios_init':
      arch/mips/pci/pci-bcm1480.c:261:36: error: 'MAX_NR_CONSOLES'
      undeclared (first use in this function)
      arch/mips/pci/pci-bcm1480.c:261:36: note: each undeclared
      identifier is reported only once for each function it appears in
      make[1]: *** [arch/mips/pci/pci-bcm1480.o] Error 1
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5858/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    • Ralf Baechle's avatar
      MIPS: Disable usermode switching of the FR bit for MIPS R5 CPUs. · 8b8a7634
      Ralf Baechle authored
      Currently the kernel will always use the FR=0 register model for O32.  If
      an O32 application did enable FR=1 mode, some data from another application
      might be leaked in the extra registers becoming visible.
      Iow, this patch is meant to make the kernel MIPS R5 tolerant but leaves
      proper MIPS R5 support to a future patchset.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    • Ralf Baechle's avatar
      MIPS: Add MIPS R5 config5 register. · 2f9ee82c
      Ralf Baechle authored
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>