1. 10 4月, 2013 8 次提交
  2. 27 3月, 2013 10 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · de55eb1d
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro:
       "stable fodder; assorted deadlock fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vt: synchronize_rcu() under spinlock is not nice...
        Nest rename_lock inside vfsmount_lock
        Don't bother with redoing rw_verify_area() from default_file_splice_from()
      de55eb1d
    • A
      vt: synchronize_rcu() under spinlock is not nice... · e8cd8169
      Al Viro 提交于
      vcs_poll_data_free() calls unregister_vt_notifier(), which calls
      atomic_notifier_chain_unregister(), which calls synchronize_rcu().
      Do it *after* we'd dropped ->f_lock.
      
      Cc: stable@vger.kernel.org (all kernels since 2.6.37)
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      e8cd8169
    • A
      Nest rename_lock inside vfsmount_lock · 7ea600b5
      Al Viro 提交于
      ... lest we get livelocks between path_is_under() and d_path() and friends.
      
      The thing is, wrt fairness lglocks are more similar to rwsems than to rwlocks;
      it is possible to have thread B spin on attempt to take lock shared while thread
      A is already holding it shared, if B is on lower-numbered CPU than A and there's
      a thread C spinning on attempt to take the same lock exclusive.
      
      As the result, we need consistent ordering between vfsmount_lock (lglock) and
      rename_lock (seq_lock), even though everything that takes both is going to take
      vfsmount_lock only shared.
      Spotted-by: NBrad Spengler <spender@grsecurity.net>
      Cc: stable@vger.kernel.org
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      7ea600b5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b175293c
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Always increment IPV4 ID field in encapsulated GSO packets, even
          when DF is set.  Regression fix from Pravin B Shelar.
      
       2) Fix per-net subsystem initialization in netfilter conntrack,
          otherwise we may access dynamically allocated memory before it is
          actually allocated.  From Gao Feng.
      
       3) Fix DMA buffer lengths in iwl3945 driver, from Stanislaw Gruszka.
      
       4) Fix race between submission of sync vs async commands in mwifiex
          driver, from Amitkumar Karwar.
      
       5) Add missing cancel of command timer in mwifiex driver, from Bing
          Zhao.
      
       6) Missing SKB free in rtlwifi USB driver, from Jussi Kivilinna.
      
       7) Thermal layer tries to use a genetlink multicast string that is
          longer than the 16 character limit.  Fix it and add a BUG check to
          prevent this kind of thing from happening in the future.
      
       From Masatake YAMATO.
      
       8) Fix many bugs in the handling of the teardown of L2TP connections,
          UDP encapsulation instances, and sockets.  From Tom Parkin.
      
       9) Missing socket release in IRDA, from Kees Cook.
      
      10) Fix fec driver modular build, from Fabio Estevam.
      
      11) Erroneous use of kfree() instead of free_netdev() in lantiq_etop,
          from Wei Yongjun.
      
      12) Fix bugs in handling of queue numbers and steering rules in mlx4
          driver, from Moshe Lazer, Hadar Hen Zion, and Or Gerlitz.
      
      13) Some FOO_DIAG_MAX constants were defined off by one, fix from Andrey
          Vagin.
      
      14) TCP segmentation deferral is unintentionally done too strongly,
          breaking ACK clocking.  Fix from Eric Dumazet.
      
      15) net_enable_timestamp() can legitimately be invoked from software
          interrupts, and in a way that is safe, so remove the WARN_ON().
          Also from Eric Dumazet.
      
      16) Fix use after free in VLANs, from Cong Wang.
      
      17) Fix TCP slow start retransmit storms after SACK reneging, from
          Yuchung Cheng.
      
      18) Unix socket release should mark a socket dead before NULL'ing out
          sock->sk, otherwise we can race.  Fix from Paul Moore.
      
      19) IPV6 addrconf code can try to free static memory, from Hong Zhiguo.
      
      20) Fix register mis-programming, NULL pointer derefs, and wrong PHC
          clock frequency in IGB driver.  From Lior LevyAlex Williamson, Jiri
          Benc, and Jeff Kirsher.
      
      21) skb->ip_summed logic in pch_gbe driver is reversed, breaking packet
          forwarding.  Fix from Veaceslav Falico.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
        ipv4: Fix ip-header identification for gso packets.
        bonding: remove already created master sysfs link on failure
        af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
        pch_gbe: fix ip_summed checksum reporting on rx
        igb: fix PHC stopping on max freq
        igb: make sensor info static
        igb: SR-IOV init reordering
        igb: Fix null pointer dereference
        igb: fix i350 anti spoofing config
        ixgbevf: don't release the soft entries
        ipv6: fix bad free of addrconf_init_net
        unix: fix a race condition in unix_release()
        tcp: undo spurious timeout after SACK reneging
        bnx2x: fix assignment of signed expression to unsigned variable
        bridge: fix crash when set mac address of br interface
        8021q: fix a potential use-after-free
        net: remove a WARN_ON() in net_enable_timestamp()
        tcp: preserve ACK clocking in TSO
        net: fix *_DIAG_MAX constants
        net/mlx4_core: Disallow releasing VF QPs which have steering rules
        ...
      b175293c
    • L
      Merge tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 5d538483
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       - Fix an NFSv4 idmapper regression
       - Fix an Oops in the pNFS blocks client
       - Fix up various issues with pNFS layoutcommit
       - Ensure correct read ordering of variables in
         rpc_wake_up_task_queue_locked
      
      * tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
        NFSv4.1: Add a helper pnfs_commit_and_return_layout
        NFSv4.1: Always clear the NFS_INO_LAYOUTCOMMIT in layoutreturn
        NFSv4.1: Fix a race in pNFS layoutcommit
        pnfs-block: removing DM device maybe cause oops when call dev_remove
        NFSv4: Fix the string length returned by the idmapper
      5d538483
    • P
      ipv4: Fix ip-header identification for gso packets. · 330305cc
      Pravin B Shelar 提交于
      ip-header id needs to be incremented even if IP_DF flag is set.
      This behaviour was changed in commit 490ab081
      (IP_GRE: Fix IP-Identification).
      
      Following patch fixes it so that identification is always
      incremented.
      Reported-by: NCong Wang <amwang@redhat.com>
      Signed-off-by: NPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      330305cc
    • V
      bonding: remove already created master sysfs link on failure · 9fe16b78
      Veaceslav Falico 提交于
      If slave sysfs symlink failes to be created - we end up without removing
      the master sysfs symlink. Remove it in case of failure.
      Signed-off-by: NVeaceslav Falico <vfalico@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9fe16b78
    • D
      af_unix: dont send SCM_CREDENTIAL when dest socket is NULL · 14134f65
      dingtianhong 提交于
      SCM_SCREDENTIALS should apply to write() syscalls only either source or destination
      socket asserted SOCK_PASSCRED. The original implememtation in maybe_add_creds is wrong,
      and breaks several LSB testcases ( i.e. /tset/LSB.os/netowkr/recvfrom/T.recvfrom).
      Origionally-authored-by: NKarel Srot <ksrot@redhat.com>
      Signed-off-by: NDing Tianhong <dingtianhong@huawei.com>
      Acked-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      14134f65
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net · 465c0a16
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      This series contains updates to ixgbevf and igb.
      
      The ixgbevf calls to pci_disable_msix() and to free the msix_entries
      memory should not occur if device open fails.  Instead they should be
      called during device driver removal to balance with the call to
      pci_enable_msix() and the call to allocate msix_entries memory
      during the device probe and driver load.
      
      The remaining 4 of 5 igb patches are simple 1-3 line patches to fix
      several issues such as possible null pointer dereference, PHC stopping
      on max frequency, make sensor info static and SR-IOV initialization
      reordering.
      
      The remaining igb patch to fix anti-spoofing config fixes a problem
      in i350 where anti spoofing configuration was written into a wrong
      register.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      465c0a16
    • V
      pch_gbe: fix ip_summed checksum reporting on rx · 76a0e681
      Veaceslav Falico 提交于
      skb->ip_summed should be CHECKSUM_UNNECESSARY when the driver reports that
      checksums were correct and CHECKSUM_NONE in any other case. They're
      currently placed vice versa, which breaks the forwarding scenario. Fix it
      by placing them as described above.
      Signed-off-by: NVeaceslav Falico <vfalico@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      76a0e681
  3. 26 3月, 2013 12 次提交
  4. 25 3月, 2013 10 次提交
    • T
      SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked · 1166fde6
      Trond Myklebust 提交于
      We need to be careful when testing task->tk_waitqueue in
      rpc_wake_up_task_queue_locked, because it can be changed while we
      are holding the queue->lock.
      By adding appropriate memory barriers, we can ensure that it is safe to
      test task->tk_waitqueue for equality if the RPC_TASK_QUEUED bit is set.
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      Cc: stable@vger.kernel.org
      1166fde6
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · c4052ba9
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Exynos and Intel fixes.
      
        The intel fixes are fairly straightforward, mostly reverts due to bugs
        found.  The exynos one is a big larger since they found some issues
        with the G2D engine and iommu interaction, and needed to verify the
        operations a lot better than they were previously, otherwise a user
        app can just crash the kernel with an iommu fault."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        Revert "drm/i915: write backlight harder"
        drm/i915: don't disable the power well yet
        Revert "drm/i915: set TRANSCODER_EDP even earlier"
        drm/exynos: Check g2d cmd list for g2d restrictions
        drm/exynos: Add a new function to get gem buffer size
        drm/exynos: Deal with g2d buffer info more efficiently
        drm/exynos: Clean up some G2D codes for readability
        drm/exynos: Fix G2D core malfunctioning issue
        drm/exynos: clear node object type at gem unmap
        drm/exynos: Fix error routine to getting dma addr.
        drm/exynos: Replaced kzalloc & memcpy with kmemdup
        drm/exynos: fimd: calculate the correct address offset
        drm/exynos: Make mixer_check_timing static
        drm/exynos: modify the compatible string for exynos fimd
      c4052ba9
    • D
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into HEAD · 7ac8833f
      Dave Airlie 提交于
      Daniel writes:
      "Just three revert/disable by default patches, one of them cc: stable
      (since the offending commit was cc: stable, too)."
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        Revert "drm/i915: write backlight harder"
        drm/i915: don't disable the power well yet
        Revert "drm/i915: set TRANSCODER_EDP even earlier"
      7ac8833f
    • D
      Merge branch 'exynos-drm-fixes' of... · ac165b00
      Dave Airlie 提交于
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into HEAD
      
      Inki writes:
      Includes bug fixes and code cleanups.
      And it considers some restrictions to G2D hardware.
      With this, the malfunction and page fault issues to g2d driver
      would be fixed.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: Check g2d cmd list for g2d restrictions
        drm/exynos: Add a new function to get gem buffer size
        drm/exynos: Deal with g2d buffer info more efficiently
        drm/exynos: Clean up some G2D codes for readability
        drm/exynos: Fix G2D core malfunctioning issue
        drm/exynos: clear node object type at gem unmap
        drm/exynos: Fix error routine to getting dma addr.
        drm/exynos: Replaced kzalloc & memcpy with kmemdup
        drm/exynos: fimd: calculate the correct address offset
        drm/exynos: Make mixer_check_timing static
        drm/exynos: modify the compatible string for exynos fimd
      ac165b00
    • Y
      tcp: undo spurious timeout after SACK reneging · 7ebe183c
      Yuchung Cheng 提交于
      On SACK reneging the sender immediately retransmits and forces a
      timeout but disables Eifel (undo). If the (buggy) receiver does not
      drop any packet this can trigger a false slow-start retransmit storm
      driven by the ACKs of the original packets. This can be detected with
      undo and TCP timestamps.
      Signed-off-by: NYuchung Cheng <ycheng@google.com>
      Acked-by: NNeal Cardwell <ncardwell@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7ebe183c
    • K
      bnx2x: fix assignment of signed expression to unsigned variable · 8fe7f99a
      Kumar Amit Mehta 提交于
      fix for incorrect assignment of signed expression to unsigned variable.
      Signed-off-by: NKumar Amit Mehta <gmate.amit@gmail.com>
      Acked-by: NDmitry Kravkov <dmitry@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8fe7f99a
    • H
      bridge: fix crash when set mac address of br interface · 9b46922e
      Hong zhi guo 提交于
      When I tried to set mac address of a bridge interface to a mac
      address which already learned on this bridge, I got system hang.
      
      The cause is straight forward: function br_fdb_change_mac_address
      calls fdb_insert with NULL source nbp. Then an fdb lookup is
      performed. If an fdb entry is found and it's local, it's OK. But
      if it's not local, source is dereferenced for printk without NULL
      check.
      Signed-off-by: NHong Zhiguo <honkiko@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9b46922e
    • C
      8021q: fix a potential use-after-free · 4a7df340
      Cong Wang 提交于
      vlan_vid_del() could possibly free ->vlan_info after a RCU grace
      period, however, we may still refer to the freed memory area
      by 'grp' pointer. Found by code inspection.
      
      This patch moves vlan_vid_del() as behind as possible.
      
      Cc: Patrick McHardy <kaber@trash.net>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NCong Wang <amwang@redhat.com>
      Acked-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4a7df340
    • E
      net: remove a WARN_ON() in net_enable_timestamp() · 9979a55a
      Eric Dumazet 提交于
      The WARN_ON(in_interrupt()) in net_enable_timestamp() can get false
      positive, in socket clone path, run from softirq context :
      
      [ 3641.624425] WARNING: at net/core/dev.c:1532 net_enable_timestamp+0x7b/0x80()
      [ 3641.668811] Call Trace:
      [ 3641.671254]  <IRQ>  [<ffffffff80286817>] warn_slowpath_common+0x87/0xc0
      [ 3641.677871]  [<ffffffff8028686a>] warn_slowpath_null+0x1a/0x20
      [ 3641.683683]  [<ffffffff80742f8b>] net_enable_timestamp+0x7b/0x80
      [ 3641.689668]  [<ffffffff80732ce5>] sk_clone_lock+0x425/0x450
      [ 3641.695222]  [<ffffffff8078db36>] inet_csk_clone_lock+0x16/0x170
      [ 3641.701213]  [<ffffffff807ae449>] tcp_create_openreq_child+0x29/0x820
      [ 3641.707663]  [<ffffffff807d62e2>] ? ipt_do_table+0x222/0x670
      [ 3641.713354]  [<ffffffff807aaf5b>] tcp_v4_syn_recv_sock+0xab/0x3d0
      [ 3641.719425]  [<ffffffff807af63a>] tcp_check_req+0x3da/0x530
      [ 3641.724979]  [<ffffffff8078b400>] ? inet_hashinfo_init+0x60/0x80
      [ 3641.730964]  [<ffffffff807ade6f>] ? tcp_v4_rcv+0x79f/0xbe0
      [ 3641.736430]  [<ffffffff807ab9bd>] tcp_v4_do_rcv+0x38d/0x4f0
      [ 3641.741985]  [<ffffffff807ae14a>] tcp_v4_rcv+0xa7a/0xbe0
      
      Its safe at this point because the parent socket owns a reference
      on the netstamp_needed, so we cant have a 0 -> 1 transition, which
      requires to lock a mutex.
      
      Instead of refining the check, lets remove it, as all known callers
      are safe. If it ever changes in the future, static_key_slow_inc()
      will complain anyway.
      Reported-by: NLaurent Chavey <chavey@google.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9979a55a
    • L
      Merge tag 'pinctrl-fixes-for-v3.9' of... · 3912a677
      Linus Torvalds 提交于
      Merge tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
      
      Pull pinctrl fixes from Linus Walleij:
       "Here are a few pinctrl fixes for the v3.9 rc series:
         - Usecount bounds checking so we do not go below zero on mux
           usecounts.
         - Loop range checking in GPIO ranges in the DT range parser.
         - Proper print in debugfs for pinconf state.
         - Fix compilation bug in generic pinconf code.
         - Minor bugfixes to abx500 and mvebu drivers."
      
      * tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinmux: forbid mux_usecount to be set at UINT_MAX
        pinctrl: mvebu: fix checking for SoC specific controls
        pinctrl: generic: Fix compilation error
        pinctrl: Print the correct information in debugfs pinconf-state file
        pinctrl: abx500: Fix checking if pin use AlternateFunction register
        gpio: fix wrong checking condition for gpio range
      3912a677