1. 16 9月, 2011 6 次提交
  2. 27 8月, 2011 6 次提交
  3. 26 8月, 2011 1 次提交
  4. 25 8月, 2011 14 次提交
    • M
      sendmmsg/sendmsg: fix unsafe user pointer access · bc909d9d
      Mathieu Desnoyers 提交于
      Dereferencing a user pointer directly from kernel-space without going
      through the copy_from_user family of functions is a bad idea. Two of
      such usages can be found in the sendmsg code path called from sendmmsg,
      added by
      
      commit c71d8ebe upstream.
      commit 5b47b8038f183b44d2d8ff1c7d11a5c1be706b34 in the 3.0-stable tree.
      
      Usages are performed through memcmp() and memcpy() directly. Fix those
      by using the already copied msg_sys structure instead of the __user *msg
      structure. Note that msg_sys can be set to NULL by verify_compat_iovec()
      or verify_iovec(), which requires additional NULL pointer checks.
      Signed-off-by: NMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Signed-off-by: NDavid Goulet <dgoulet@ev0ke.net>
      CC: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      CC: Anton Blanchard <anton@samba.org>
      CC: David S. Miller <davem@davemloft.net>
      CC: stable <stable@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bc909d9d
    • A
      ibmveth: Fix leak when recycling skb and hypervisor returns error · c6f59d13
      Anton Blanchard 提交于
      If h_add_logical_lan_buffer returns an error we need to free
      the skb.
      Signed-off-by: NAnton Blanchard <anton@samba.org>
      Cc: stable <stable@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c6f59d13
    • E
      arp: fix rcu lockdep splat in arp_process() · 20e6074e
      Eric Dumazet 提交于
      Dave Jones reported a lockdep splat triggered by an arp_process() call
      from parp_redo().
      
      Commit faa9dcf7 (arp: RCU changes) is the origin of the bug, since
      it assumed arp_process() was called under rcu_read_lock(), which is not
      true in this particular path.
      
      Instead of adding rcu_read_lock() in parp_redo(), I chose to add it in
      neigh_proxy_process() to take care of IPv6 side too.
      
       ===================================================
       [ INFO: suspicious rcu_dereference_check() usage. ]
       ---------------------------------------------------
       include/linux/inetdevice.h:209 invoked rcu_dereference_check() without
      protection!
      
       other info that might help us debug this:
      
       rcu_scheduler_active = 1, debug_locks = 0
       4 locks held by setfiles/2123:
        #0:  (&sb->s_type->i_mutex_key#13){+.+.+.}, at: [<ffffffff8114cbc4>]
      walk_component+0x1ef/0x3e8
        #1:  (&isec->lock){+.+.+.}, at: [<ffffffff81204bca>]
      inode_doinit_with_dentry+0x3f/0x41f
        #2:  (&tbl->proxy_timer){+.-...}, at: [<ffffffff8106a803>]
      run_timer_softirq+0x157/0x372
        #3:  (class){+.-...}, at: [<ffffffff8141f256>] neigh_proxy_process
      +0x36/0x103
      
       stack backtrace:
       Pid: 2123, comm: setfiles Tainted: G        W
      3.1.0-0.rc2.git7.2.fc16.x86_64 #1
       Call Trace:
        <IRQ>  [<ffffffff8108ca23>] lockdep_rcu_dereference+0xa7/0xaf
        [<ffffffff8146a0b7>] __in_dev_get_rcu+0x55/0x5d
        [<ffffffff8146a751>] arp_process+0x25/0x4d7
        [<ffffffff8146ac11>] parp_redo+0xe/0x10
        [<ffffffff8141f2ba>] neigh_proxy_process+0x9a/0x103
        [<ffffffff8106a8c4>] run_timer_softirq+0x218/0x372
        [<ffffffff8106a803>] ? run_timer_softirq+0x157/0x372
        [<ffffffff8141f220>] ? neigh_stat_seq_open+0x41/0x41
        [<ffffffff8108f2f0>] ? mark_held_locks+0x6d/0x95
        [<ffffffff81062bb6>] __do_softirq+0x112/0x25a
        [<ffffffff8150d27c>] call_softirq+0x1c/0x30
        [<ffffffff81010bf5>] do_softirq+0x4b/0xa2
        [<ffffffff81062f65>] irq_exit+0x5d/0xcf
        [<ffffffff8150dc11>] smp_apic_timer_interrupt+0x7c/0x8a
        [<ffffffff8150baf3>] apic_timer_interrupt+0x73/0x80
        <EOI>  [<ffffffff8108f439>] ? trace_hardirqs_on_caller+0x121/0x158
        [<ffffffff814fc285>] ? __slab_free+0x30/0x24c
        [<ffffffff814fc283>] ? __slab_free+0x2e/0x24c
        [<ffffffff81204e74>] ? inode_doinit_with_dentry+0x2e9/0x41f
        [<ffffffff81204e74>] ? inode_doinit_with_dentry+0x2e9/0x41f
        [<ffffffff81204e74>] ? inode_doinit_with_dentry+0x2e9/0x41f
        [<ffffffff81130cb0>] kfree+0x108/0x131
        [<ffffffff81204e74>] inode_doinit_with_dentry+0x2e9/0x41f
        [<ffffffff81204fc6>] selinux_d_instantiate+0x1c/0x1e
        [<ffffffff81200f4f>] security_d_instantiate+0x21/0x23
        [<ffffffff81154625>] d_instantiate+0x5c/0x61
        [<ffffffff811563ca>] d_splice_alias+0xbc/0xd2
        [<ffffffff811b17ff>] ext4_lookup+0xba/0xeb
        [<ffffffff8114bf1e>] d_alloc_and_lookup+0x45/0x6b
        [<ffffffff8114cbea>] walk_component+0x215/0x3e8
        [<ffffffff8114cdf8>] lookup_last+0x3b/0x3d
        [<ffffffff8114daf3>] path_lookupat+0x82/0x2af
        [<ffffffff8110fc53>] ? might_fault+0xa5/0xac
        [<ffffffff8110fc0a>] ? might_fault+0x5c/0xac
        [<ffffffff8114c564>] ? getname_flags+0x31/0x1ca
        [<ffffffff8114dd48>] do_path_lookup+0x28/0x97
        [<ffffffff8114df2c>] user_path_at+0x59/0x96
        [<ffffffff811467ad>] ? cp_new_stat+0xf7/0x10d
        [<ffffffff811469a6>] vfs_fstatat+0x44/0x6e
        [<ffffffff811469ee>] vfs_lstat+0x1e/0x20
        [<ffffffff81146b3d>] sys_newlstat+0x1a/0x33
        [<ffffffff8108f439>] ? trace_hardirqs_on_caller+0x121/0x158
        [<ffffffff812535fe>] ? trace_hardirqs_on_thunk+0x3a/0x3f
        [<ffffffff8150af82>] system_call_fastpath+0x16/0x1b
      Reported-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      20e6074e
    • E
      bridge: fix a possible use after free · 22df1331
      Eric Dumazet 提交于
      br_multicast_ipv6_rcv() can call pskb_trim_rcsum() and therefore skb
      head can be reallocated.
      
      Cache icmp6_type field instead of dereferencing twice the struct
      icmp6hdr pointer.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      22df1331
    • Y
      bridge: Pseudo-header required for the checksum of ICMPv6 · 4b275d7e
      Yan, Zheng 提交于
      Checksum of ICMPv6 is not properly computed because the pseudo header is not used.
      Thus, the MLD packet gets dropped by the bridge.
      Signed-off-by: NZheng Yan <zheng.z.yan@intel.com>
      Reported-by: NAng Way Chuang <wcang@sfc.wide.ad.jp>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4b275d7e
    • Y
      mcast: Fix source address selection for multicast listener report · e05c4ad3
      Yan, Zheng 提交于
      Should check use count of include mode filter instead of total number
      of include mode filters.
      Signed-off-by: NZheng Yan <zheng.z.yan@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e05c4ad3
    • N
      MAINTAINERS: Update GIT trees for network development · 814fd609
      Nicolas de Pesloüan 提交于
      Remove -2.6 from net and net-next tree names.
      Signed-off-by: NNicolas de Pesloüan <nicolas.2p.debian@free.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      814fd609
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · a53e77fa
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wiimote: Add status and return request handlers
        HID: wiimote: Add drm request
        HID: wiimote: Register led class devices
        HID: wiimote: Correctly call HID open/close callbacks
        HID: wiimote: Simplify synchronization
        HID: usbhid: Add support for SiGma Micro chip
        HID: add support for new revision of Apple aluminum keyboard
      a53e77fa
    • M
      ath9k: Fix PS wrappers in ath9k_set_coverage_class · 8b2a3827
      Mohammed Shafi Shajakhan 提交于
      this callback is called during suspend/resume and also via iw command.
      it configures parameters like sifs, slottime, acktimeout in
      ath9k_hw_init_global_settings where few REG_READ, REG_RMW are also done
      and hence the need for PS wrappers
      
      Cc: stable@kernel.org
      Signed-off-by: NMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      8b2a3827
    • A
      carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock · 66cb54bd
      Alexey Khoroshilov 提交于
      If is_main_vif(ar, vif) reports that we have to fall back
      to software encryption, we goto err_softw; before locking ar->mutex.
      As a result, we have unprotected call to carl9170_set_operating_mode
      and unmatched mutex_unlock.
      
      The patch fix the issue by adding mutex_lock before goto.
      
      Found by Linux Driver Verification project (linuxtesting.org).
      Signed-off-by: NAlexey Khoroshilov <khoroshilov@ispras.ru>
      Cc: <stable@kernel.org>
      Acked-By: NChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      66cb54bd
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 8554cc18
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: ad714x - read the interrupt status registers in a row
        Input: ad714x - use DMA-safe buffers for spi_write()
        Input: ad714x - fix endianness issues
        Input: ad714xx-spi - force SPI bus into the default 8-bit mode
        Input: ep93xx_keypad - add missing include of linux/module.h
        Input: tnetv107x-ts - add missing include of linux/module.h
        Input: max11801_ts - correct license statement
        Input: atmel_mxt_ts - report pressure information from the driver
        Input: bcm5974 - Add support for newer MacBookPro8,2
        Input: wacom - report id 3 returns 4 bytes of data
        Input: wacom - add WAC_MSG_RETRIES define
        Input: wacom - add support for the Wacom Bamboo Pen (CTL-660/K)
        Input: tegra-kbc - correct call to input_free_device
        Input: mpu3050 - correct call to input_free_device
        Input: bcm5974 - add support for touchpads found in MacBookAir4,2
        Input: mma8450 - fix module device table type
        Input: remove CLOCK_TICK_RATE from analog joystick driver
      8554cc18
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 051732bc
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
        fuse: mark pages accessed when written to
        fuse: delete dead .write_begin and .write_end aops
        fuse: fix flock
        fuse: fix non-ANSI void function notation
      051732bc
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 2983573e
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Allow handling signals when stack is corrupted.
      2983573e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2da2c664
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
        bridge: fix a possible net_device leak
        net: Documentation: RFC 2553bis is now RFC 3493
        atm: br2684: Fix oops due to skb->dev being NULL
        ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS
        net: netdev-features.txt update to Documentation/networking/00-INDEX
        vlan: reset headers on accel emulation path
        forcedeth: call vlan_mode only if hw supports vlans
        via-velocity: remove non-tagged packet filtering
        bonding:reset backup and inactive flag of slave
        net_sched: fix port mirror/redirect stats reporting
        sit tunnels: propagate IPv6 transport class to IPv4 Type of Service
        gianfar: reduce stack usage in gianfar_ethtool.c
        net: minor update to Documentation/networking/scaling.txt
        net: add missing entries to Documentation/networking/00-INDEX
        gianfar: prevent buggy hw rx vlan tagging
        net: sh_eth: Fix build by forgot including linux/interrupt.h
        drivers/net/can/sja1000/plx_pci.c: eliminate double free
        usbnet/cdc_ncm: Don't use stack variables for DMA
        vmxnet3: Don't enable vlan filters in promiscuous mode.
        iwlagn: sysfs couldn't find the priv pointer
        ...
      2da2c664
  5. 24 8月, 2011 12 次提交
  6. 23 8月, 2011 1 次提交