1. 10 Jul, 2011 1 commit
    • Jim Cromie's avatar
      natsemi: fix another dma-debug report · ff181774
      Jim Cromie authored
      commit 2fb83cd6
      Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Date:   Sun Jul 3 22:34:29 2011 -0700
      
      Above commit fixed previously reported warning, but I later
      noticed another one at shutdown.  This commit fixes it.
      
      ------------[ cut here ]------------
      WARNING: at /home/jimc/projects/lx/linux-2.6/lib/dma-debug.c:820 check_unmap+0x1fe/0x56c()
      natsemi 0000:00:06.0: DMA-API: device driver frees DMA memory with different size [device address=0x0000000007356840] [map size=1538 bytes] [unmap size=1522 bytes]
      Modules linked in: bridge stp llc x_tables ipv6 pc87360 hwmon_vid scx200_hrt pc8736x_gpio scx200_gpio nsc_gpio scx200_acb i2c_core arc4 rtl8180 mac80211 eeprom_93cx6 cfg80211 pcspkr scx200 rfkill ide_gd_mod ide_pci_generic ohci_hcd usbcore sc1200 ide_core [last unloaded: ebtables]
      Pid: 3996, comm: ifconfig Not tainted 3.0.0-rc6-skc-dyndbg+ #104
      Call Trace:
       [<c011ca97>] warn_slowpath_common+0x4a/0x5f
       [<c0261ca5>] ? check_unmap+0x1fe/0x56c
       [<c011cb10>] warn_slowpath_fmt+0x26/0x2a
       [<c0261ca5>] check_unmap+0x1fe/0x56c
       [<c0116505>] ? check_preempt_curr+0x5a/0x6a
       [<c0262186>] debug_dma_unmap_page+0x53/0x5b
       [<c02aaaf9>] pci_unmap_single+0x4d/0x57
       [<c02aab51>] drain_rx+0x4e/0x74
       [<c02acc6e>] netdev_close+0x103/0x1b8
       [<c02f097e>] ? spin_unlock_bh.clone.30+0x12/0x14
       [<c02f10aa>] ? dev_deactivate_many+0xc1/0xef
       [<c02e05e9>] __dev_close_many+0x69/0x86
       [<c02e0625>] __dev_close+0x1f/0x2c
       [<c02e3200>] __dev_change_flags+0x92/0x107
       [<c02e32db>] dev_change_flags+0x13/0x3f
       [<c031e7ea>] devinet_ioctl+0x248/0x4b3
       [<c02e3a9e>] ? dev_ioctl+0x50a/0x54c
       [<c031f509>] inet_ioctl+0x8e/0xa7
       [<c02d506f>] sock_ioctl+0x1b6/0x1da
       [<c02d4eb9>] ? sock_fasync+0x61/0x61
       [<c0183db4>] do_vfs_ioctl+0x44d/0x47f
       [<c0113cdb>] ? do_page_fault+0x268/0x299
       [<c01339d0>] ? __put_cred+0x34/0x36
       [<c0177d83>] ? sys_faccessat+0x13e/0x14b
       [<c0183e14>] sys_ioctl+0x2e/0x4a
       [<c035bc95>] syscall_call+0x7/0xb
      ---[ end trace 7013a1bdac403e56 ]---
      Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ff181774
  2. 08 Jul, 2011 7 commits
    • Thomas Graf's avatar
      sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket · cd4fcc70
      Thomas Graf authored
      Trigger user ABORT if application closes a socket which has data
      queued on the socket receive queue or chunks waiting on the
      reassembly or ordering queue as this would imply data being lost
      which defeats the point of a graceful shutdown.
      
      This behavior is already practiced in TCP.
      
      We do not check the input queue because that would mean to parse
      all chunks on it to look for unacknowledged data which seems too
      much of an effort. Control chunks or duplicated chunks may also
      be in the input queue and should not be stopping a graceful
      shutdown.
      Signed-off-by: default avatarThomas Graf <tgraf@infradead.org>
      Acked-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cd4fcc70
    • David S. Miller's avatar
    • David S. Miller's avatar
      net: Fix default in docs for tcp_orphan_retries. · 06b8fc5d
      David S. Miller authored
      Default should be listed at 8 instead of 7.
      Reported-by: default avatarDenys Fedoryshchenko <denys@visp.net.lb>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06b8fc5d
    • Greg KH's avatar
      hso: fix a use after free condition · 5e2cd082
      Greg KH authored
      This needs to go to netdev:
      
      From: Octavian Purdila <octavian.purdila@intel.com>
      
      In hso_free_net_device hso_net pointer is freed and then used to
      cleanup urb pools. Catched with SLAB_DEBUG during S3 resume:
      
      [   95.824442] Pid: 389, comm: khubd Tainted: G         C  2.6.36greenridge-01400-g423cf13-dirty #154 Type2 - Board Product Name1/OakTrail
      [   95.824442] EIP: 0060:[<c1151551>] EFLAGS: 00010202 CPU: 0
      [   95.824442] EIP is at kref_put+0x29/0x42
      [   95.824442] EAX: 6b6b6b6b EBX: 6b6b6b6b ECX: c2806b40 EDX: 00000037
      [   95.824442] ESI: c1258d56 EDI: edd3d128 EBP: ee8cde0c ESP: ee8cde04
      [   95.824442]  DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
      [   95.824442] Process khubd (pid: 389, ti=ee8cc000 task=ee95ed10 task.ti=ee8cc000)
      [   95.824442] Stack:
      [   95.824442]  edd07020 00000000 ee8cde14 c1258b77 ee8cde38 ef933a44 ef93572b ef935dec
      [   95.824442] <0> 0000099a 6b6b6b6b 00000000 ee2da748 edd3e0c0 ee8cde54 ef933b9f ee3b53f8
      [   95.824442] <0> 00000002 ee2da748 ee2da764 ef936658 ee8cde60 ef933d0c ee2da748 ee8cde84
      [   95.824442] Call Trace:
      [   95.824442]  [<c1258b77>] ? usb_free_urb+0x11/0x13
      [   95.824442]  [<ef933a44>] ? hso_free_net_device+0x81/0xd8 [hso]
      [   95.824442]  [<ef933b9f>] ? hso_free_interface+0x104/0x111 [hso]
      [   95.824442]  [<ef933d0c>] ? hso_disconnect+0xb/0x18 [hso]
      [   95.824442]  [<c125b7f1>] ? usb_unbind_interface+0x44/0x14a
      [   95.824442]  [<c11e56e8>] ? __device_release_driver+0x6f/0xb1
      [   95.824442]  [<c11e57c7>] ? device_release_driver+0x18/0x23
      [   95.824442]  [<c11e4e92>] ? bus_remove_device+0x8a/0xa1
      [   95.824442]  [<c11e3970>] ? device_del+0x129/0x163
      [   95.824442]  [<c11e2dc0>] ? put_device+0xf/0x11
      [   95.824442]  [<c11e39bc>] ? device_unregister+0x12/0x15
      [   95.824442]  [<c125915f>] ? usb_disable_device+0x90/0xf0
      [   95.824442]  [<c125544f>] ? usb_disconnect+0x6d/0xf8
      [   95.824442]  [<c1255f91>] ? hub_thread+0x3fc/0xc57
      [   95.824442]  [<c1048526>] ? autoremove_wake_function+0x0/0x2f
      [   95.824442]  [<c102529d>] ? complete+0x34/0x3e
      [   95.824442]  [<c1255b95>] ? hub_thread+0x0/0xc57
      [   95.824442]  [<c10481fc>] ? kthread+0x63/0x68
      [   95.824442]  [<c1048199>] ? kthread+0x0/0x68
      [   95.824442]  [<c1002d76>] ? kernel_thread_helper+0x6/0x10
      Signed-off-by: default avatarOctavian Purdila <octavian.purdila@intel.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5e2cd082
    • Jean Delvare's avatar
      net/natsemi: Fix module parameter permissions · b1f524e3
      Jean Delvare authored
      The third parameter of module_param is supposed to represent sysfs
      file permissions. A value of "1" leads to the following:
      
      $ ls -l /sys/module/natsemi/parameters/
      total 0
      ---------x 1 root root 4096 Jul  8 09:46 dspcfg_workaround
      
      I am changing it to "0" to align with the other module parameters in
      this driver.
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      Cc: Tim Hockin <thockin@hockin.org>
      Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1f524e3
    • Tushar Gohad's avatar
      XFRM: Fix memory leak in xfrm_state_update · 8fcbc637
      Tushar Gohad authored
      Upon "ip xfrm state update ..", xfrm_add_sa() takes an extra reference on
      the user-supplied SA and forgets to drop the reference when
      xfrm_state_update() returns 0.  This leads to a memory leak as the
      parameter SA is never freed.  This change attempts to fix the leak by
      calling __xfrm_state_put() when xfrm_state_update() updates a valid SA
      (err = 0).  The parameter SA is added to the gc list when the final
      reference is dropped by xfrm_add_sa() upon completion.
      Signed-off-by: default avatarTushar Gohad <tgohad@mvista.com>
      Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8fcbc637
    • John W. Linville's avatar
      Merge branch 'master' of... · 8a98d935
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
      8a98d935
  3. 07 Jul, 2011 18 commits
  4. 06 Jul, 2011 14 commits