1. 23 Oct, 2013 23 commits
    • David S. Miller's avatar
      Merge branch 'frag_hash_secret' · 0cad43a7
      David S. Miller authored
      Hannes Frederic Sowa says:
      
      ====================
      initialize fragment hash secrets with net_get_random_once
      
      This series switches the inet_frag.rnd hash initialization to
      net_get_random_once.
      
      Included patches:
       ipv4: initialize ip4_frags hash secret as late
       ipv6: split inet6_hash_frag for netfilter and
       inet: remove old fragmentation hash initializing
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0cad43a7
    • Hannes Frederic Sowa's avatar
      inet: remove old fragmentation hash initializing · 7088ad74
      Hannes Frederic Sowa authored
      All fragmentation hash secrets now get initialized by their
      corresponding hash function with net_get_random_once. Thus we can
      eliminate the initial seeding.
      
      Also provide a comment that hash secret seeding happens at the first
      call to the corresponding hashing function.
      
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Eric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7088ad74
    • Hannes Frederic Sowa's avatar
      ipv6: split inet6_hash_frag for netfilter and initialize secrets with net_get_random_once · b1190570
      Hannes Frederic Sowa authored
      Defer the fragmentation hash secret initialization for IPv6 like the
      previous patch did for IPv4.
      
      Because the netfilter logic reuses the hash secret we have to split it
      first. Thus introduce a new nf_hash_frag function which takes care to
      seed the hash secret.
      
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: Pablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1190570
    • Hannes Frederic Sowa's avatar
      ipv4: initialize ip4_frags hash secret as late as possible · e7b519ba
      Hannes Frederic Sowa authored
      Defer the generation of the first hash secret for the ipv4 fragmentation
      cache as late as possible.
      
      ip4_frags.rnd gets initial seeded by inet_frags_init and regulary
      reseeded by inet_frag_secret_rebuild. Either we call ipqhashfn directly
      from ip_fragment.c in which case we initialize the secret directly.
      
      If we first get called by inet_frag_secret_rebuild we install a new secret
      by a manual call to get_random_bytes. This secret will be overwritten
      as soon as the first call to ipqhashfn happens. This is safe because we
      won't race while publishing the new secrets with anyone else.
      
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e7b519ba
    • David S. Miller's avatar
      Merge branch 'pci_set_drvdata' · df33db0f
      David S. Miller authored
      Jingoo Han syas:
      
      ====================
      ethernet: remove unnecessary pci_set_drvdata() part 4
      
      Since commit 0998d063
      (device-core: Ensure drvdata = NULL when no driver is bound),
      the driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      df33db0f
    • Jingoo Han's avatar
      net: via-rhine: remove unnecessary pci_set_drvdata() · a3b8a16b
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a3b8a16b
    • Jingoo Han's avatar
      net: tc35815: remove unnecessary pci_set_drvdata() · 2a2ee993
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2a2ee993
    • Jingoo Han's avatar
      net: spider_net: remove unnecessary pci_set_drvdata() · df5d3859
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      df5d3859
    • Jingoo Han's avatar
      net: tlan: remove unnecessary pci_set_drvdata() · b921f9ab
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b921f9ab
    • Jingoo Han's avatar
      net: tehuti: remove unnecessary pci_set_drvdata() · 89f45c70
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      89f45c70
    • Jingoo Han's avatar
      net: niu: remove unnecessary pci_set_drvdata() · 0956eaff
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0956eaff
    • Jingoo Han's avatar
      net: sungem: remove unnecessary pci_set_drvdata() · 3a93ac0b
      Jingoo Han authored
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3a93ac0b
    • Sergei Shtylyov's avatar
      sh_eth: add/use RMCR.RNC bit · 305a3388
      Sergei Shtylyov authored
      Declare 'enum RMCR_BIT' containing the single member for the RMCR.RNC bit and
      replace bare numbers in the driver by  this mnemonic.
      Suggested-by: default avatarDavid Miller <davem@davemloft.net>
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      305a3388
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c3fa32b9
      David S. Miller authored
      Conflicts:
      	drivers/net/usb/qmi_wwan.c
      	include/net/dst.h
      
      Trivial merge conflicts, both were overlapping changes.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c3fa32b9
    • Hannes Frederic Sowa's avatar
      net: always inline net_secret_init · 34d92d53
      Hannes Frederic Sowa authored
      Currently net_secret_init does not get inlined, so we always have a call
      to net_secret_init even in the fast path.
      
      Let's specify net_secret_init as __always_inline so we have the nop in
      the fast-path without the call to net_secret_init and the unlikely path
      at the epilogue of the function.
      
      jump_labels handle the inlining correctly.
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      34d92d53
    • Christoph Paasch's avatar
      net: Dereference pointer-value of sk_prot->memory_pressure · 35b87f6c
      Christoph Paasch authored
      2e685cad (tcp_memcontrol: Kill struct tcp_memcontrol) falsly modified
      the access to memory_pressure of sk->sk_prot->memory_pressure. The patch
      did modify the memory_pressure-field of struct cg_proto, but not the one
      of struct proto.
      
      So, the access to sk_prot->memory_pressure should not be changed.
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarChristoph Paasch <christoph.paasch@uclouvain.be>
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      35b87f6c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 320437af
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       "Several last minute bug fixes.
      
        Two of them are on the larger side for rc7, the dasd format patch for
        older storage devices and the store-clock-fast patch where we have
        been to optimistic with an optimization"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/time: correct use of store clock fast
        s390/vmlogrdr: fix array access in vmlogrdr_open()
        s390/compat,signal: fix return value of copy_siginfo_(to|from)_user32()
        s390/dasd: check for availability of prefix command during format
        s390/mm,kvm: fix software dirty bits vs. kvm for old machines
      320437af
    • Linus Torvalds's avatar
      Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 90338325
      Linus Torvalds authored
      Pull thermal management fixes from Zhang Rui:
       "These includes several commits that are necessary to properly fix
        regression for TMU test MUX address setting after reset, for exynos
        thermal driver.
      
        Specifics:
      
         - fix a regression that the removal of setting a certain field at TMU
           configuration setting results in immediately shutdown after reset
           on Exynos4412 SoC.
      
         - revert a patch which tries to link the thermal_zone device and its
           hwmon node but breaks libsensors.
      
         - fix a deadlock/lockdep warning issue in x86_pkg_temp thermal
           driver, which can be reproduced on a buggy platform only.
      
         - fix ti-soc-thermal driver to fall back on bandgap reading when
           reading from PCB temperature sensor fails"
      
      * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        Revert "drivers: thermal: parent virtual hwmon with thermal zone"
        drivers: thermal: allow ti-soc-thermal run without pcb zone
        thermal: exynos: Provide initial setting for TMU's test MUX address at Exynos4412
        thermal: exynos: Provide separate TMU data for Exynos4412
        thermal: exynos: Remove check for thermal device pointer at exynos_report_trigger()
        Thermal: x86_pkg_temp: change spin lock
      90338325
    • Randy Dunlap's avatar
      platform/x86: fix asus-wmi build error · ea89e1d3
      Randy Dunlap authored
      Fix build error in asus_wmi.c when ASUS_WMI=y and ACPI_VIDEO=m
      by preventing that combination.
      
        drivers/built-in.o: In function `asus_wmi_probe':
        asus-wmi.c:(.text+0x65ddb4): undefined reference to `acpi_video_unregister'
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea89e1d3
    • Kent Overstreet's avatar
      bcache: Fixed incorrect order of arguments to bio_alloc_bioset() · d4eddd42
      Kent Overstreet authored
      Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
      Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d4eddd42
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · f4e5e14f
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       - Compilation fixes for GCC < 4.4.6
       - one Kbuild dependency select fix (selecting videobuf on msi3101)
       - driver fixes on tda10071, e4000, msi3101, soc_camera, s5p-jpeg,
         saa7134 and adv7511
       - some device quirks needed to make them work properly
       - some videobuf2 core regression fixes for some features used only on
         embedded drivers
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] saa7134: Fix crash when device is closed before streamoff
        [media] adv7511: fix error return code in adv7511_probe()
        [media] ths8200: fix compilation with GCC < 4.4.6
        [media] ad9389b: fix compilation with GCC < 4.4.6
        [media] adv7511: fix compilation with GCC < 4.4.6
        [media] adv7842: fix compilation with GCC < 4.4.6
        [media] s5p-jpeg: Initialize vfd_decoder->vfl_dir field
        [media] videobuf2-dc: Fix support for mappings without struct page in userptr mode
        [media] vb2: Allow queuing OUTPUT buffers with zeroed 'bytesused'
        [media] mx3-camera: locking cleanup in mx3_videobuf_queue()
        [media] sh_vou: almost forever loop in sh_vou_try_fmt_vid_out()
        [media] tda10071: change firmware download condition
        [media] msi3101: correct max videobuf2 alloc
        [media] Add HCL T12Rg-H to STK webcam upside-down table
        [media] msi3101: Kconfig select VIDEOBUF2_VMALLOC
        [media] msi3101: msi3101_ioctl_ops can be static
        [media] e4000: fix PLL calc bug on 32-bit arch
        [media] uvcvideo: quirk PROBE_DEF for Microsoft Lifecam NX-3000
        [media] uvcvideo: quirk PROBE_DEF for Dell SP2008WFP monitor
      f4e5e14f
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 0d645a8b
      Linus Torvalds authored
      Pull infiniband bugfix from Roland Dreier:
       "Disable not-quite-ready userspace ABI for IB flow steering"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Temporarily disable create_flow/destroy_flow uverbs
      0d645a8b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · db10accf
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "Sorry I let so much accumulate, I was in Buffalo and wanted a few
        things to cook in my tree for a while before sending to you.  Anyways,
        it's a lot of little things as usual at this stage in the game"
      
       1) Make bonding MAINTAINERS entry reflect reality, from Andy
          Gospodarek.
      
       2) Fix accidental sock_put() on timewait mini sockets, from Eric
          Dumazet.
      
       3) Fix crashes in l2tp due to mis-handling of ipv4 mapped ipv6
          addresses, from François CACHEREUL.
      
       4) Fix heap overflow in __audit_sockaddr(), from the eagle eyed Dan
          Carpenter.
      
       5) tcp_shifted_skb() doesn't take handle FINs properly, from Eric
          Dumazet.
      
       6) SFC driver bug fixes from Ben Hutchings.
      
       7) Fix TX packet scheduling wedge after channel change in ath9k driver,
          from Felix Fietkau.
      
       8) Fix user after free in BPF JIT code, from Alexei Starovoitov.
      
       9) Source address selection test is reversed in
          __ip_route_output_key(), fix from Jiri Benc.
      
      10) VLAN and CAN layer mis-size netlink attributes, from Marc
          Kleine-Budde.
      
      11) Fix permission checks in sysctls to use current_euid() instead of
          current_uid().  From Eric W Biederman.
      
      12) IPSEC policies can go away while a timer is still pending for them,
          add appropriate ref-counting to fix, from Steffen Klassert.
      
      13) Fix mis-programming of FDR and RMCR registers on R8A7740 sh_eth
          chips, from Nguyen Hong Ky and Simon Horman.
      
      14) MLX4 forgets to DMA unmap pages on RX, fix from Amir Vadai.
      
      15) IPV6 GRE tunnel MTU upper limit is miscalculated, from Oussama
          Ghorbel.
      
      16) Fix typo in fq_change(), we were assigning "initial quantum" to
          "quantum".  From Eric Dumazet.
      
      17) Set a more appropriate sk_pacing_rate for non-TCP sockets, otherwise
          FQ packet scheduler does not pace those flows properly.  Also from
          Eric Dumazet.
      
      18) rtlwifi miscalculates packet pointers, from Mark Cave-Ayland.
      
      19) l2tp_xmit_skb() can be called from process context, not just softirq
          context, so we must always make sure to BH disable around it.  From
          Eric Dumazet.
      
      20) On qdisc reset, we forget to purge the RB tree of SKBs in netem
          packet scheduler.  From Stephen Hemminger.
      
      21) Fix info leak in farsync WAN driver ioctl() handler, from Dan
          Carpenter and Salva Peiró.
      
      22) Fix PHY reset and other issues in dm9000 driver, from Nikita
          Kiryanov and Michael Abbott.
      
      23) When hardware can do SCTP crc32 checksums, we accidently don't
          disable the csum offload when IPSEC transformations have been
          applied.  From Fan Du and Vlad Yasevich.
      
      24) Tail loss probing in TCP leaves the socket in the wrong congestion
          avoidance state.  From Yuchung Cheng.
      
      25) In CPSW driver, enable NAPI before interrupts are turned on, from
          Markus Pargmann.
      
      26) Integer underflow and dual-assignment in YAM hamradio driver, from
          Dan Carpenter.
      
      27) If we are going to mangle a packet in tcp_set_skb_tso_segs() we must
          unclone it.  This fixes various hard to track down crashes in
          drivers where the SKBs ->gso_segs was changing right from underneath
          the driver during TX queueing.  From Eric Dumazet.
      
      28) Fix the handling of VLAN IDs, and in particular the special IDs 0
          and 4095, in the bridging layer.  From Toshiaki Makita.
      
      29) Another info leak, this time in wanxl WAN driver, from Salva Peiró.
      
      30) Fix race in socket credential passing, from Daniel Borkmann.
      
      31) WHen NETLABEL is disabled, we don't validate CIPSO packets properly,
          from Seif Mazareeb.
      
      32) Fix identification of fragmented frames in ipv4/ipv6 UDP
          Fragmentation Offload output paths, from Jiri Pirko.
      
      33) Virtual Function fixes in bnx2x driver from Yuval Mintz and Ariel
          Elior.
      
      34) When we removed the explicit neighbour pointer from ipv6 routes a
          slight regression was introduced for users such as IPVS, xt_TEE, and
          raw sockets.  We mix up the users requested destination address with
          the routes assigned nexthop/gateway.  From Julian Anastasov and
          Simon Horman.
      
      35) Fix stack overruns in rt6_probe(), the issue is that can end up
          doing two full packet xmit paths at the same time when emitting
          neighbour discovery messages.  From Hannes Frederic Sowa.
      
      36) davinci_emac driver doesn't handle IFF_ALLMULTI correctly, from
          Mariusz Ceier.
      
      37) Make sure to set TCP sk_pacing_rate after the first legitimate RTT
          sample, from Neal Cardwell.
      
      38) Wrong netlink attribute passed to xfrm_replay_verify_len(), from
          Steffen Klassert.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (152 commits)
        ax88179_178a: Add VID:DID for Samsung USB Ethernet Adapter
        ax88179_178a: Correct the RX error definition in RX header
        Revert "bridge: only expire the mdb entry when query is received"
        tcp: initialize passive-side sk_pacing_rate after 3WHS
        davinci_emac.c: Fix IFF_ALLMULTI setup
        mac802154: correct a typo in ieee802154_alloc_device() prototype
        ipv6: probe routes asynchronous in rt6_probe
        netfilter: nf_conntrack: fix rt6i_gateway checks for H.323 helper
        ipv6: fill rt6i_gateway with nexthop address
        ipv6: always prefer rt6i_gateway if present
        bnx2x: Set NETIF_F_HIGHDMA unconditionally
        bnx2x: Don't pretend during register dump
        bnx2x: Lock DMAE when used by statistic flow
        bnx2x: Prevent null pointer dereference on error flow
        bnx2x: Fix config when SR-IOV and iSCSI are enabled
        bnx2x: Fix Coalescing configuration
        bnx2x: Unlock VF-PF channel on MAC/VLAN config error
        bnx2x: Prevent an illegal pointer dereference during panic
        bnx2x: Fix Maximum CoS estimation for VFs
        drivers: net: cpsw: fix kernel warn during iperf test with interrupt pacing
        ...
      db10accf
  2. 22 Oct, 2013 17 commits