1. 04 11月, 2013 1 次提交
    • D
      net: sctp: do not trigger BUG_ON in sctp_cmd_delete_tcb · 7926c1d5
      Daniel Borkmann 提交于
      Introduced in f9e42b85 ("net: sctp: sideeffect: throw BUG if
      primary_path is NULL"), we intended to find a buggy assoc that's
      part of the assoc hash table with a primary_path that is NULL.
      However, we better remove the BUG_ON for now and find a more
      suitable place to assert for these things as Mark reports that
      this also triggers the bug when duplication cookie processing
      happens, and the assoc is not part of the hash table (so all
      good in this case). Such a situation can for example easily be
      reproduced by:
      
        tc qdisc add dev eth0 root handle 1: prio bands 2 priomap 1 1 1 1 1 1
        tc qdisc add dev eth0 parent 1:2 handle 20: netem loss 20%
        tc filter add dev eth0 protocol ip parent 1: prio 2 u32 match ip \
                  protocol 132 0xff match u8 0x0b 0xff at 32 flowid 1:2
      
      This drops 20% of COOKIE-ACK packets. After some follow-up
      discussion with Vlad we came to the conclusion that for now we
      should still better remove this BUG_ON() assertion, and come up
      with two follow-ups later on, that is, i) find a more suitable
      place for this assertion, and possibly ii) have a special
      allocator/initializer for such kind of temporary assocs.
      Reported-by: NMark Thomas <Mark.Thomas@metaswitch.com>
      Signed-off-by: NVlad Yasevich <vyasevich@gmail.com>
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Acked-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7926c1d5
  2. 02 11月, 2013 2 次提交
  3. 01 11月, 2013 1 次提交
  4. 31 10月, 2013 1 次提交
  5. 30 10月, 2013 8 次提交
    • N
      bgmac: don't update slot on skb alloc/dma mapping error · b757a62e
      Nathan Hintz 提交于
      Don't update the slot in "bgmac_dma_rx_skb_for_slot" unless both the
      skb alloc and dma mapping are successful; and free the newly allocated
      skb if a dma mapping error occurs.  This relieves the caller of the need
      to deduce/execute the appropriate cleanup action required when an error
      occurs.
      Signed-off-by: NNathan Hintz <nlhintz@hotmail.com>
      Acked-by: NRafał Miłecki <zajec5@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b757a62e
    • A
      ibm emac: Fix locking for enable/disable eob irq · 32663b8b
      Alistair Popple 提交于
      Calls to mal_enable_eob_irq perform a read-write-modify of a dcr to
      enable device irqs which is protected by a spin lock. However calls to
      mal_disable_eob_irq do not take the corresponding lock.
      
      This patch resolves the problem by ensuring that calls to
      mal_disable_eob_irq also take the lock.
      Signed-off-by: NAlistair Popple <alistair@popple.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      32663b8b
    • A
      ibm emac: Don't call napi_complete if napi_reschedule failed · b4dfd326
      Alistair Popple 提交于
      This patch fixes a bug which would trigger the BUG_ON() at
      net/core/dev.c:4156. It was found that this was due to continuing
      processing in the current poll call even when the call to
      napi_reschedule failed, indicating the device was already on the
      polling list. This resulted in an extra call to napi_complete which
      triggered the BUG_ON().
      
      This patch ensures that we only contine processing rotting packets in
      the current mal_poll call if we are not already on the polling list.
      Signed-off-by: NAlistair Popple <alistair@popple.id.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b4dfd326
    • J
      virtio-net: correctly handle cpu hotplug notifier during resuming · ec9debbd
      Jason Wang 提交于
      commit 3ab098df (virtio-net: don't respond to
      cpu hotplug notifier if we're not ready) tries to bypass the cpu hotplug
      notifier by checking the config_enable and does nothing is it was false. So it
      need to try to hold the config_lock mutex which may happen in atomic
      environment which leads the following warnings:
      
      [  622.944441] CPU0 attaching NULL sched-domain.
      [  622.944446] CPU1 attaching NULL sched-domain.
      [  622.944485] CPU0 attaching NULL sched-domain.
      [  622.950795] BUG: sleeping function called from invalid context at kernel/mutex.c:616
      [  622.950796] in_atomic(): 1, irqs_disabled(): 1, pid: 10, name: migration/1
      [  622.950796] no locks held by migration/1/10.
      [  622.950798] CPU: 1 PID: 10 Comm: migration/1 Not tainted 3.12.0-rc5-wl-01249-gb91e82d #317
      [  622.950799] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [  622.950802]  0000000000000000 ffff88001d42dba0 ffffffff81a32f22 ffff88001bfb9c70
      [  622.950803]  ffff88001d42dbb0 ffffffff810edb02 ffff88001d42dc38 ffffffff81a396ed
      [  622.950805]  0000000000000046 ffff88001d42dbe8 ffffffff810e861d 0000000000000000
      [  622.950805] Call Trace:
      [  622.950810]  [<ffffffff81a32f22>] dump_stack+0x54/0x74
      [  622.950815]  [<ffffffff810edb02>] __might_sleep+0x112/0x114
      [  622.950817]  [<ffffffff81a396ed>] mutex_lock_nested+0x3c/0x3c6
      [  622.950818]  [<ffffffff810e861d>] ? up+0x39/0x3e
      [  622.950821]  [<ffffffff8153ea7c>] ? acpi_os_signal_semaphore+0x21/0x2d
      [  622.950824]  [<ffffffff81565ed1>] ? acpi_ut_release_mutex+0x5e/0x62
      [  622.950828]  [<ffffffff816d04ec>] virtnet_cpu_callback+0x33/0x87
      [  622.950830]  [<ffffffff81a42576>] notifier_call_chain+0x3c/0x5e
      [  622.950832]  [<ffffffff810e86a8>] __raw_notifier_call_chain+0xe/0x10
      [  622.950835]  [<ffffffff810c5556>] __cpu_notify+0x20/0x37
      [  622.950836]  [<ffffffff810c5580>] cpu_notify+0x13/0x15
      [  622.950838]  [<ffffffff81a237cd>] take_cpu_down+0x27/0x3a
      [  622.950841]  [<ffffffff81136289>] stop_machine_cpu_stop+0x93/0xf1
      [  622.950842]  [<ffffffff81136167>] cpu_stopper_thread+0xa0/0x12f
      [  622.950844]  [<ffffffff811361f6>] ? cpu_stopper_thread+0x12f/0x12f
      [  622.950847]  [<ffffffff81119710>] ? lock_release_holdtime.part.7+0xa3/0xa8
      [  622.950848]  [<ffffffff81135e4b>] ? cpu_stop_should_run+0x3f/0x47
      [  622.950850]  [<ffffffff810ea9b0>] smpboot_thread_fn+0x1c5/0x1e3
      [  622.950852]  [<ffffffff810ea7eb>] ? lg_global_unlock+0x67/0x67
      [  622.950854]  [<ffffffff810e36b7>] kthread+0xd8/0xe0
      [  622.950857]  [<ffffffff81a3bfad>] ? wait_for_common+0x12f/0x164
      [  622.950859]  [<ffffffff810e35df>] ? kthread_create_on_node+0x124/0x124
      [  622.950861]  [<ffffffff81a45ffc>] ret_from_fork+0x7c/0xb0
      [  622.950862]  [<ffffffff810e35df>] ? kthread_create_on_node+0x124/0x124
      [  622.950876] smpboot: CPU 1 is now offline
      [  623.194556] SMP alternatives: lockdep: fixing up alternatives
      [  623.194559] smpboot: Booting Node 0 Processor 1 APIC 0x1
      ...
      
      A correct fix is to unregister the hotcpu notifier during restore and register a
      new one in resume.
      Reported-by: NFengguang Wu <fengguang.wu@intel.com>
      Tested-by: NFengguang Wu <fengguang.wu@intel.com>
      Cc: Wanlong Gao <gaowanlong@cn.fujitsu.com>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: NWanlong Gao <gaowanlong@cn.fujitsu.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ec9debbd
    • V
      bridge: pass correct vlan id to multicast code · 06499098
      Vlad Yasevich 提交于
      Currently multicast code attempts to extrace the vlan id from
      the skb even when vlan filtering is disabled.  This can lead
      to mdb entries being created with the wrong vlan id.
      Pass the already extracted vlan id to the multicast
      filtering code to make the correct id is used in
      creation as well as lookup.
      Signed-off-by: NVlad Yasevich <vyasevic@redhat.com>
      Acked-by: NToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      06499098
    • D
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch · 911aeb10
      David S. Miller 提交于
      Jesse Gross says:
      
      ====================
      One patch for net/3.12 fixing an issue where devices could be in an
      invalid state they are removed while still attached to OVS.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      911aeb10
    • M
      net: x25: Fix dead URLs in Kconfig · 706e282b
      Michael Drüing 提交于
      Update the URLs in the Kconfig file to the new pages at sangoma.com and cisco.com
      Signed-off-by: NMichael Drüing <michael@drueing.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      706e282b
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · 68783ec7
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      This pull request contains the following netfilter fix:
      
      * fix --queue-bypass in xt_NFQUEUE revision 3. While adding the
        revision 3 of this target, the bypass flags were not correctly
        handled anymore, thus, breaking packet bypassing if no application
        is listening from userspace, patch from Holger Eitzenberger,
        reported by Florian Westphal.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      68783ec7
  6. 29 10月, 2013 6 次提交
  7. 28 10月, 2013 7 次提交
  8. 26 10月, 2013 10 次提交
  9. 24 10月, 2013 2 次提交
  10. 23 10月, 2013 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 320437af
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 90338325
      Linus Torvalds 提交于
      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