6 years ago- patches.drivers/DRM-Radeon-Fix-TV-DAC-Load-Detection-for-single-CRTC-chips.patch:
Egbert Eich [Wed, 7 Nov 2012 18:21:09 +0000 (19:21 +0100)]
- patches.drivers/DRM-Radeon-Fix-TV-DAC-Load-Detection-for-single-CRTC-chips.patch:
  DRM/Radeon: Fix TV DAC Load Detection for single CRTC chips
  (bnc #725152).

suse-commit: 074e302786322e5a349841b07101e69765c4233e

6 years ago- patches.drivers/DRM-Radeon-Clean-up-code-in-TV-DAC-load-detection.patch:
Egbert Eich [Wed, 7 Nov 2012 18:20:22 +0000 (19:20 +0100)]
- patches.drivers/DRM-Radeon-Clean-up-code-in-TV-DAC-load-detection.patch:
  DRM/Radeon: Clean up code in TV DAC load detection (bnc #725152).

suse-commit: f869af3e3b7f440b2fff683e1dff1c4b0501da47

6 years ago- patches.drivers/DRM-Radeon-On-DVI-I-use-Load-Detection-when-EDID-is-bogus.patch:
Egbert Eich [Wed, 7 Nov 2012 18:19:37 +0000 (19:19 +0100)]
- patches.drivers/DRM-Radeon-On-DVI-I-use-Load-Detection-when-EDID-is-bogus.patch:
  DRM/Radeon: On DVI-I use Load Detection when EDID is bogus
  (bnc #725152).

suse-commit: 03d1a879f7e73921fa111cb4332a089c35c12c6d

6 years ago- patches.drivers/DRM-Radeon-Fix-primary-DAC-Load-Detection-for-RV100-chips.patch:
Egbert Eich [Wed, 7 Nov 2012 18:18:30 +0000 (19:18 +0100)]
- patches.drivers/DRM-Radeon-Fix-primary-DAC-Load-Detection-for-RV100-chips.patch:
  DRM/Radeon: Fix primary DAC Load Detection for RV100 chips
  (bnc #725152).

suse-commit: 02dfd2af88d6dc98b8c69fb52e9b1560a1bde4db

6 years ago- patches.drivers/DRM-Radeon-Fix-Load-Detection-on-legacy-primary-DAC.patch:
Egbert Eich [Wed, 7 Nov 2012 18:15:22 +0000 (19:15 +0100)]
- patches.drivers/DRM-Radeon-Fix-Load-Detection-on-legacy-primary-DAC.patch:
  DRM/Radeon: Fix Load Detection on legacy primary DAC (bnc #725152).

suse-commit: 4e930650a576c899509ff1f5b1ca7feef3835373

6 years ago- patches.fixes/x86-kexec-temporary-hack-v2: Refresh.
Jiri Slaby [Wed, 7 Nov 2012 14:44:06 +0000 (15:44 +0100)]
- patches.fixes/x86-kexec-temporary-hack-v2: Refresh.
  Fix of fix, sorry about that.

suse-commit: 88a89f25a1bf0f08125c589aa6d6f13eaaca9e40

6 years ago- patches.fixes/x86-kexec-temporary-hack-v2: Refresh.
Jiri Slaby [Wed, 7 Nov 2012 14:11:53 +0000 (15:11 +0100)]
- patches.fixes/x86-kexec-temporary-hack-v2: Refresh.
  Fix bug in 3.0.50 merge (compiler emitted a new warning).

suse-commit: 89b319f83c862ec85a3f72a275acef065872ffc8

6 years ago- patches.arch/s390-60-01-smsgiucv-resume.patch: smsgiucv:
John Jolly [Wed, 7 Nov 2012 05:39:42 +0000 (06:39 +0100)]
- patches.arch/s390-60-01-smsgiucv-resume.patch: smsgiucv:
  reestablish IUCV path after resume (bnc#786976,LTC#86245).
- patches.arch/s390-60-02-dasd_move_wake_up_call.patch: dasd:
  move wake_up call (bnc#786976,LTC#86252).
- patches.arch/s390-60-03-gup-task-size.patch: kernel: fix
  get_user_pages_fast() page table walk (bnc#786976,LTC#86307).

suse-commit: d86cdf7d947ff20d3142f8f8c8dadd1e7cf7bcfa

6 years ago- supported.conf: mark ipset modules supported (fate#313309)
Jiri Bohac [Tue, 6 Nov 2012 16:56:23 +0000 (17:56 +0100)]
- supported.conf: mark ipset modules supported (fate#313309)

suse-commit: 93c114d927661f08eee9ee7ef39a6bb930c5e736

6 years agoseries.conf: fix malformed patch names
David Sterba [Tue, 6 Nov 2012 14:51:09 +0000 (15:51 +0100)]
series.conf: fix malformed patch names

suse-commit: 8e7a0c082f409829f3423a1cc74ff827a26ef9a2

6 years ago- patches.fixes/kvm-invalid-opcode-oops-on-SET_SREGS-with-OSXSAVE-bi.patch:
Bruce Rogers [Tue, 6 Nov 2012 13:40:39 +0000 (06:40 -0700)]
- patches.fixes/kvm-invalid-opcode-oops-on-SET_SREGS-with-OSXSAVE-bi.patch:
  kvm: invalid opcode oops on SET_SREGS with OSXSAVE bit set
  (bnc#787821 CVE-2012-4461).

suse-commit: 9e8177e0743621243e1de0827d411448591ca250

6 years ago- patches.suse/md-Do-not-block-when-displaying-info.patch:
NeilBrown [Tue, 6 Nov 2012 01:57:39 +0000 (12:57 +1100)]
- patches.suse/md-Do-not-block-when-displaying-info.patch:
  Change 'goto' target to avoid pointless 'bug' messages in
  normal error cases. (bnc#787848)

suse-commit: 535579839f026bdd039261135743a185f86aa0ef

6 years agobtrfs-8147-fix-file-extent-discount-problem-in-the-snapsh.patch: remove stale file
David Sterba [Mon, 5 Nov 2012 16:40:18 +0000 (17:40 +0100)]
btrfs-8147-fix-file-extent-discount-problem-in-the-snapsh.patch: remove stale file

suse-commit: b962f8ab2a78b2051f5c803217b2df0a71b06ef3

6 years ago- patches.arch/intel_idle_add_ivy_bridge_support.patch:
Thomas Renninger [Mon, 5 Nov 2012 09:03:50 +0000 (10:03 +0100)]
- patches.arch/intel_idle_add_ivy_bridge_support.patch:
  intel_idle: IVB support (fate#313719).

suse-commit: f073df16883549a39f3e0463052fcda957ef86de

6 years ago- patches.suse/btrfs-8180-Return-EINVAL-when-length-to-trim-is-less-than.patch:
David Sterba [Fri, 2 Nov 2012 23:30:06 +0000 (00:30 +0100)]
- patches.suse/btrfs-8180-Return-EINVAL-when-length-to-trim-is-less-than.patch:
  btrfs: Return EINVAL when length to trim is less than FSB
- patches.suse/btrfs-8181-fix-unnecessary-while-loop-when-search-the-fre.patch:
  Btrfs: fix unnecessary while loop when search the free space,
  cache (FATE#306586).
- patches.suse/btrfs-8182-Use-btrfs_update_inode_fallback-when-creating-.patch:
  Btrfs: Use btrfs_update_inode_fallback when creating a snapshot
- patches.suse/btrfs-8183-do-not-bug-when-we-fail-to-commit-the-transact.patch:
  Btrfs: do not bug when we fail to commit the transaction
- patches.suse/btrfs-8184-fill-the-global-reserve-when-unpinning-space.patch:
  Btrfs: fill the global reserve when unpinning space
- patches.suse/btrfs-8185-don-t-allow-degraded-mount-if-too-many-devices.patch:
  Btrfs: don't allow degraded mount if too many devices are
  missing (FATE#306586).

suse-commit: feaa280413b337ab900399b139b45cec7a7ba0af

6 years agoRevert "- patches.fixes/kvm-invalid-opcode-oops-on-SET_SREGS-with-OSXSAVE-bi.patch:"
Bruce Rogers [Fri, 2 Nov 2012 20:03:03 +0000 (14:03 -0600)]
Revert "- patches.fixes/kvm-invalid-opcode-oops-on-SET_SREGS-with-OSXSAVE-bi.patch:"
Revert checkin since patch is embargoed.

This reverts commit 775cfaa54e8b228b73251d0ed2cd7cd522737d0d.

suse-commit: 0acc16de00f7a2218fa1285ddbfb43b795745719

6 years ago- patches.arch/x86_powernow-k8-dont-complain-on-missing-cpufreq-on-hp.patch:
Thomas Renninger [Fri, 2 Nov 2012 17:21:05 +0000 (18:21 +0100)]
- patches.arch/x86_powernow-k8-dont-complain-on-missing-cpufreq-on-hp.patch:
  X86 cpufreq: Do not complain on missing cpufreq tables on
  ProLiants (bnc#787202).

suse-commit: a717338f22365ad4bee3d67e69360ad35a301b24

6 years ago- patches.fixes/kvm-invalid-opcode-oops-on-SET_SREGS-with-OSXSAVE-bi.patch:
Bruce Rogers [Fri, 2 Nov 2012 17:09:47 +0000 (11:09 -0600)]
- patches.fixes/kvm-invalid-opcode-oops-on-SET_SREGS-with-OSXSAVE-bi.patch:
  kvm: invalid opcode oops on SET_SREGS with OSXSAVE bit set
  (bnc#787821 CVE-2012-4461).

suse-commit: bf178e0e1f7532d7c255e537d42e4d9dba1db8ba

6 years ago- patches.fixes/hpilo-remove-pci_disable_device.patch: MISC:
Jiri Slaby [Fri, 2 Nov 2012 10:35:36 +0000 (11:35 +0100)]
- patches.fixes/hpilo-remove-pci_disable_device.patch: MISC:
  hpilo, remove pci_disable_device (bnc#752544).

suse-commit: 87b2e9abbf173c85956c2cc98acc0b4dfced875d

6 years ago- Linux 3.0.50.
Jiri Slaby [Wed, 31 Oct 2012 23:16:39 +0000 (00:16 +0100)]
- Linux 3.0.50.
- patches.fixes/x86-kexec-temporary-hack-v2: Refresh.

suse-commit: eef0d74ee5966cf8b74174243b957b33741a276c

6 years ago- patches.drivers/ixgbe-Address-fact-that-RSC-was-not-setting-GSO-size.patch:
Benjamin Poirier [Thu, 1 Nov 2012 15:37:13 +0000 (11:37 -0400)]
- patches.drivers/ixgbe-Address-fact-that-RSC-was-not-setting-GSO-size.patch:
  ixgbe: Address fact that RSC was not setting GSO size for
  incoming frames (bnc#776144).

suse-commit: fe324d73c3533a7f2dc7564e2168771029519549

6 years ago- Update kabi files.
Michal Marek [Thu, 1 Nov 2012 14:23:34 +0000 (15:23 +0100)]
- Update kabi files.

suse-commit: 4f6ab0a8698176d541c147a4d8454ef1bf6b7481

6 years agoMerge branch 'scripts' into SLE11-SP2
Michal Marek [Thu, 1 Nov 2012 14:18:44 +0000 (15:18 +0100)]
Merge branch 'scripts' into SLE11-SP2

suse-commit: 306dcc74331f6d3a4dfa755ec5fbd77992667014

6 years agoscripts/update-symvers: Fix handling of s390x on SLE11-SP1+
Michal Marek [Thu, 1 Nov 2012 14:15:44 +0000 (15:15 +0100)]
scripts/update-symvers: Fix handling of s390x on SLE11-SP1+

Since SP1, s390x is treated separately from s390.

suse-commit: e18c3ed4537f3712f395a0db6ed569e39a996797
Note: This patch series did not apply

6 years ago- patches.suse/msft-hv-0404-Drivers-hv-Cleanup-error-handling-in-vmbus_open.patch:
Olaf Hering [Thu, 1 Nov 2012 11:44:25 +0000 (12:44 +0100)]
- patches.suse/msft-hv-0404-Drivers-hv-Cleanup-error-handling-in-vmbus_open.patch:
  Drivers: hv: Cleanup error handling in vmbus_open().
- patches.suse/msft-hv-0405-SCSI-storvsc-Account-for-in-transit-packets-in-the-R.patch:
  [SCSI] storvsc: Account for in-transit packets in the RESET
- patches.fixes/hv-storvsc-reset-wait.patch: Delete.

suse-commit: 10fb6e620d8f02dea46689751a02e49186343719

6 years ago- patches.kabi/kabi-rmap-remove-inclusion.patch: kABI: rmap,
Jiri Slaby [Wed, 31 Oct 2012 23:14:46 +0000 (00:14 +0100)]
- patches.kabi/kabi-rmap-remove-inclusion.patch: kABI: rmap,
  remove inclusion.

suse-commit: 4d28c98c1fe1aed1f4d59d395674bc605a7dbf92

6 years ago- patches.drivers/sg-remove-sg_mutex.patch: sg: remove sg_mutex.
Lee Duncan [Wed, 31 Oct 2012 22:09:14 +0000 (15:09 -0700)]
- patches.drivers/sg-remove-sg_mutex.patch: sg: remove sg_mutex.

suse-commit: cb96b0af95085410ff802783f709f3af9b5c9474

6 years ago- patches.fixes/perf-do-no-try-to-schedule-task-events.patch:
Tony Jones [Wed, 31 Oct 2012 18:14:45 +0000 (19:14 +0100)]
- patches.fixes/perf-do-no-try-to-schedule-task-events.patch:
  perf: Do no try to schedule task events if there are none
- patches.fixes/perf-do-not-set-task_ctx-pointer-in-cpuctx.patch:
  perf: Do not set task_ctx pointer in cpuctx if there are no
  events in the context (bnc#781574).

suse-commit: 34e8ab92ca7b61ce1d2956f557f47c5309c336e7

6 years agoLinux 3.0.50
Greg Kroah-Hartman [Wed, 31 Oct 2012 16:51:59 +0000 (09:51 -0700)]
Linux 3.0.50

6 years agodrm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
Sjoerd Simons [Fri, 22 Jun 2012 07:43:07 +0000 (09:43 +0200)]
drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13

commit 9756fe38d10b2bf90c81dc4d2f17d5632e135364 upstream.

This box claims to have an LVDS interface but doesn't
actually have one.

Signed-off-by: Sjoerd Simons <>
Signed-off-by: Daniel Vetter <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agostaging: comedi: amplc_pc236: fix invalid register access during detach
Ian Abbott [Wed, 3 Oct 2012 15:25:17 +0000 (16:25 +0100)]
staging: comedi: amplc_pc236: fix invalid register access during detach

commit aaeb61a97b7159ebe30b18a422d04eeabfa8790b upstream.

`pc236_detach()` is called by the comedi core if it attempted to attach
a device and failed.  `pc236_detach()` calls `pc236_intr_disable()` if
the comedi device private data pointer (`devpriv`) is non-null.  This
test is insufficient as `pc236_intr_disable()` accesses hardware
registers and the attach routine may have failed before it has saved
their I/O base addresses.

Fix it by checking `dev->iobase` is non-zero before calling
`pc236_intr_disable()` as that means the I/O base addresses have been
saved and the hardware registers can be accessed.  It also implies the
comedi device private data pointer is valid, so there is no need to
check it.

Signed-off-by: Ian Abbott <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agox86, mm: Undo incorrect revert in arch/x86/mm/init.c
Yinghai Lu [Thu, 25 Oct 2012 22:45:26 +0000 (15:45 -0700)]
x86, mm: Undo incorrect revert in arch/x86/mm/init.c

commit f82f64dd9f485e13f29f369772d4a0e868e5633a upstream.


    844ab6f9 x86, mm: Find_early_table_space based on ranges that are actually being mapped

added back some lines back wrongly that has been removed in commit

    7b16bbf97 Revert "x86/mm: Fix the size calculation of mapping tables"

remove them again.

Signed-off-by: Yinghai Lu <>
Acked-by: Jacob Shin <>
Signed-off-by: H. Peter Anvin <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agox86, mm: Find_early_table_space based on ranges that are actually being mapped
Jacob Shin [Wed, 24 Oct 2012 19:24:44 +0000 (14:24 -0500)]
x86, mm: Find_early_table_space based on ranges that are actually being mapped

commit 844ab6f993b1d32eb40512503d35ff6ad0c57030 upstream.

Current logic finds enough space for direct mapping page tables from 0
to end. Instead, we only need to find enough space to cover mr[0].start
to mr[nr_range].end -- the range that is actually being mapped by

This is needed after 1bbbbe779aabe1f0768c2bf8f8c0a5583679b54a, to address
the panic reported here:

Signed-off-by: Jacob Shin <>
Tested-by: Tom Rini <>
Signed-off-by: H. Peter Anvin <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agocpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
Andreas Herrmann [Mon, 22 Oct 2012 22:55:10 +0000 (00:55 +0200)]
cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code

commit e4df1cbcc1f329e53a1fff7450b2229e0addff20 upstream.

Commit 6889125b8b4e09c5e53e6ecab3433bed1ce198c9
(cpufreq/powernow-k8: workqueue user shouldn't migrate the kworker to another CPU)
causes powernow-k8 to trigger a preempt warning, e.g.:

  BUG: using smp_processor_id() in preemptible [00000000] code: cpufreq/3776
  caller is powernowk8_target+0x20/0x49
  Pid: 3776, comm: cpufreq Not tainted 3.6.0 #9
  Call Trace:
   [<ffffffff8125b447>] debug_smp_processor_id+0xc7/0xe0
   [<ffffffff814877e7>] powernowk8_target+0x20/0x49
   [<ffffffff81482b02>] __cpufreq_driver_target+0x82/0x8a
   [<ffffffff81484fc6>] cpufreq_governor_performance+0x4e/0x54
   [<ffffffff81482c50>] __cpufreq_governor+0x8c/0xc9
   [<ffffffff81482e6f>] __cpufreq_set_policy+0x1a9/0x21e
   [<ffffffff814839af>] store_scaling_governor+0x16f/0x19b
   [<ffffffff81484f16>] ? cpufreq_update_policy+0x124/0x124
   [<ffffffff8162b4a5>] ? _raw_spin_unlock_irqrestore+0x2c/0x49
   [<ffffffff81483640>] store+0x60/0x88
   [<ffffffff811708c0>] sysfs_write_file+0xf4/0x130
   [<ffffffff8111243b>] vfs_write+0xb5/0x151
   [<ffffffff811126e0>] sys_write+0x4a/0x71
   [<ffffffff816319a9>] system_call_fastpath+0x16/0x1b

Fix this by by always using work_on_cpu().

Signed-off-by: Andreas Herrmann <>
Signed-off-by: Rafael J. Wysocki <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agobcma: fix unregistration of cores
Piotr Haber [Thu, 11 Oct 2012 12:05:15 +0000 (14:05 +0200)]
bcma: fix unregistration of cores

commit 1fffa905adffbf0d3767fc978ef09afb830275eb upstream.

When cores are unregistered, entries
need to be removed from cores list in a safe manner.

Reported-by: Stanislaw Gruszka <>
Reviewed-by: Arend Van Spriel <>
Signed-off-by: Piotr Haber <>
Signed-off-by: John W. Linville <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agomac80211: check if key has TKIP type before updating IV
Stanislaw Gruszka [Tue, 2 Oct 2012 19:34:23 +0000 (21:34 +0200)]
mac80211: check if key has TKIP type before updating IV

commit 4045f72bcf3c293c7c5932ef001742d8bb5ded76 upstream.

This patch fix corruption which can manifest itself by following crash
when switching on rfkill switch with rt2x00 driver:

Pointer key->u.ccmp.tfm of group key get corrupted in:


        /* update IV in key information to be able to detect replays */
        rx->key->u.tkip.rx[rx->security_idx].iv32 = rx->tkip_iv32;
        rx->key->u.tkip.rx[rx->security_idx].iv16 = rx->tkip_iv16;

because rt2x00 always set RX_FLAG_MMIC_STRIPPED, even if key is not TKIP.

We already check type of the key in different path in
ieee80211_rx_h_michael_mic_verify() function, so adding additional
check here is reasonable.

Signed-off-by: Stanislaw Gruszka <>
Signed-off-by: John W. Linville <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoARM: at91/i2c: change id to let i2c-gpio work
Bo Shen [Mon, 15 Oct 2012 09:30:27 +0000 (17:30 +0800)]
ARM: at91/i2c: change id to let i2c-gpio work

commit 7840487cd6298f9f931103b558290d8d98d41c49 upstream.

The i2c core driver will turn the platform device ID to busnum
When using platfrom device ID as -1, it means dynamically assigned
the busnum. When writing code, we need to make sure the busnum,
and call i2c_register_board_info(int busnum, ...) to register device
if using -1, we do not know the value of busnum

In order to solve this issue, set the platform device ID as a fix number
Here using 0 to match the busnum used in i2c_regsiter_board_info()

Signed-off-by: Bo Shen <>
Acked-by: Jean Delvare <>
Signed-off-by: Nicolas Ferre <>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <>
Acked-by: Ludovic Desroches <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agovhost: fix mergeable bufs on BE hosts
Michael S. Tsirkin [Wed, 24 Oct 2012 18:37:51 +0000 (20:37 +0200)]
vhost: fix mergeable bufs on BE hosts

commit 910a578f7e9400a78a3b13aba0b4d2df16a2cb05 upstream.

We copy head count to a 16 bit field, this works by chance on LE but on
BE guest gets 0. Fix it up.

Signed-off-by: Michael S. Tsirkin <>
Tested-by: Alexander Graf <>
Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoxhci: Fix potential NULL ptr deref in command cancellation.
Sarah Sharp [Tue, 16 Oct 2012 20:17:43 +0000 (13:17 -0700)]
xhci: Fix potential NULL ptr deref in command cancellation.

commit 43a09f7fb01fa1e091416a2aa49b6c666458c1ee upstream.

The command cancellation code doesn't check whether find_trb_seg()
couldn't find the segment that contains the TRB to be canceled.  This
could cause a NULL pointer deference later in the function when next_trb
is called.  It's unlikely to happen unless something is wrong with the
command ring pointers, so add some debugging in case it happens.

This patch should be backported to stable kernels as old as 3.0, that
contain the commit b63f4053cc8aa22a98e3f9a97845afe6c15d0a0d "xHCI:
handle command after aborting the command ring".

Signed-off-by: Sarah Sharp <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: mos7840: remove invalid disconnect handling
Johan Hovold [Thu, 25 Oct 2012 16:56:33 +0000 (18:56 +0200)]
USB: mos7840: remove invalid disconnect handling

commit e681b66f2e19fadbe8a7e2a17900978cb6bc921f upstream.

Remove private zombie flag used to signal disconnect and to prevent
control urb from being submitted from interrupt urb completion handler.

The control urb will not be re-submitted as both the control urb and the
interrupt urb is killed on disconnect.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: mos7840: remove NULL-urb submission
Johan Hovold [Thu, 25 Oct 2012 16:56:32 +0000 (18:56 +0200)]
USB: mos7840: remove NULL-urb submission

commit 28c3ae9a8cf45f439c9a0779ebd0256e2ae72813 upstream.

The private int_urb is never allocated so the submission from the
control completion handler will always fail. Remove this odd piece of
broken code.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: mos7840: fix port-device leak in error path
Johan Hovold [Thu, 25 Oct 2012 11:35:10 +0000 (13:35 +0200)]
USB: mos7840: fix port-device leak in error path

commit 3eb55cc4ed88eee3b5230f66abcdbd2a91639eda upstream.

The driver set the usb-serial port pointers to NULL on errors in attach,
effectively preventing usb-serial core from decrementing the port ref
counters and releasing the port devices and associated data.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: mos7840: fix urb leak at release
Johan Hovold [Thu, 25 Oct 2012 11:35:09 +0000 (13:35 +0200)]
USB: mos7840: fix urb leak at release

commit 65a4cdbb170e4ec1a7fa0e94936d47e24a17b0e8 upstream.

Make sure control urb is freed at release.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: sierra: fix memory leak in probe error path
Johan Hovold [Thu, 25 Oct 2012 08:29:18 +0000 (10:29 +0200)]
USB: sierra: fix memory leak in probe error path

commit 084817d79399ab5ccab2f90a148b0369912a8369 upstream.

Move interface data allocation to attach so that it is deallocated on
errors in usb-serial probe.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: sierra: fix memory leak in attach error path
Johan Hovold [Thu, 25 Oct 2012 08:29:17 +0000 (10:29 +0200)]
USB: sierra: fix memory leak in attach error path

commit 7e41f9bcdd2e813ea2a3c40db291d87ea06b559f upstream.

Make sure port private data is deallocated on errors in attach.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: serial: Fix memory leak in sierra_release()
Lennart Sorensen [Wed, 24 Oct 2012 14:23:09 +0000 (10:23 -0400)]
USB: serial: Fix memory leak in sierra_release()

commit f7bc5051667b74c3861f79eed98c60d5c3b883f7 upstream.

I found a memory leak in sierra_release() (well sierra_probe() I guess)
that looses 8 bytes each time the driver releases a device.

Signed-off-by: Len Sorensen <>
Acked-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: opticon: fix memory leak in error path
Johan Hovold [Thu, 25 Oct 2012 08:29:12 +0000 (10:29 +0200)]
USB: opticon: fix memory leak in error path

commit acbf0e5263de563e25f7c104868e4490b9e72b13 upstream.

Fix memory leak in write error path.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: opticon: fix DMA from stack
Johan Hovold [Thu, 25 Oct 2012 08:29:11 +0000 (10:29 +0200)]
USB: opticon: fix DMA from stack

commit ea0dbebffe118724cd4df7d9b071ea8ee48d48f0 upstream.

Make sure to allocate the control-message buffer dynamically as some
platforms cannot do DMA from stack.

Note that only the first byte of the old buffer was used.

Signed-off-by: Johan Hovold <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: whiteheat: fix memory leak in error path
Johan Hovold [Thu, 25 Oct 2012 08:29:01 +0000 (10:29 +0200)]
USB: whiteheat: fix memory leak in error path

commit c129197c99550d356cf5f69b046994dd53cd1b9d upstream.

Make sure command buffer is deallocated in case of errors during attach.

Signed-off-by: Johan Hovold <>
Cc: <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agousb hub: send clear_tt_buffer_complete events when canceling TT clear work
Octavian Purdila [Mon, 1 Oct 2012 19:21:12 +0000 (22:21 +0300)]
usb hub: send clear_tt_buffer_complete events when canceling TT clear work

commit 3b6054da68f9b0d5ed6a7ed0f42a79e61904352c upstream.

There is a race condition in the USB hub code with regard to handling
TT clear requests that can get the HCD driver in a deadlock. Usually
when an TT clear request is scheduled it will be executed immediately:

<7>[    6.077583] usb 2-1.3: unlink qh1-0e01/f4d4db00 start 0 [1/2 us]
<3>[    6.078041] usb 2-1: clear tt buffer port 3, a3 ep2 t04048d82
<7>[    6.078299] hub_tt_work:731
<7>[    9.309089] usb 2-1.5: link qh1-0e01/f4d506c0 start 0 [1/2 us]
<7>[    9.324526] ehci_hcd 0000:00:1d.0: reused qh f4d4db00 schedule
<7>[    9.324539] usb 2-1.3: link qh1-0e01/f4d4db00 start 0 [1/2 us]
<7>[    9.341530] usb 1-1.1: link qh4-0e01/f397aec0 start 2 [1/2 us]
<7>[   10.116159] usb 2-1.3: unlink qh1-0e01/f4d4db00 start 0 [1/2 us]
<3>[   10.116459] usb 2-1: clear tt buffer port 3, a3 ep2 t04048d82
<7>[   10.116537] hub_tt_work:731

However, if a suspend operation is triggered before hub_tt_work is
scheduled, hub_quiesce will cancel the work without notifying the HCD

<3>[   35.033941] usb 2-1: clear tt buffer port 3, a3 ep2 t04048d80
<5>[   35.034022] sd 0:0:0:0: [sda] Stopping disk
<7>[   35.034039] hub 2-1:1.0: hub_suspend
<7>[   35.034067] usb 2-1: unlink qh256-0001/f3b1ab00 start 1 [1/0 us]
<7>[   35.035085] hub 1-0:1.0: hub_suspend
<7>[   35.035102] usb usb1: bus suspend, wakeup 0
<7>[   35.035106] ehci_hcd 0000:00:1a.0: suspend root hub
<7>[   35.035298] hub 2-0:1.0: hub_suspend
<7>[   35.035313] usb usb2: bus suspend, wakeup 0
<7>[   35.035315] ehci_hcd 0000:00:1d.0: suspend root hub
<6>[   35.250017] PM: suspend of devices complete after 216.979 msecs
<6>[   35.250822] PM: late suspend of devices complete after 0.799 msecs
<7>[   35.252343] ehci_hcd 0000:00:1d.0: wakeup: 1
<7>[   35.262923] ehci_hcd 0000:00:1d.0: --> PCI D3hot
<7>[   35.263302] ehci_hcd 0000:00:1a.0: wakeup: 1
<7>[   35.273912] ehci_hcd 0000:00:1a.0: --> PCI D3hot
<6>[   35.274254] PM: noirq suspend of devices complete after 23.442 msecs
<6>[   35.274975] ACPI: Preparing to enter system sleep state S3
<6>[   35.292666] PM: Saving platform NVS memory
<7>[   35.295030] Disabling non-boot CPUs ...
<6>[   35.297351] CPU 1 is now offline
<6>[   35.300345] CPU 2 is now offline
<6>[   35.303929] CPU 3 is now offline
<7>[   35.303931] lockdep: fixing up alternatives.
<6>[   35.304825] Extended CMOS year: 2000

When the device will resume the EHCI driver will get stuck in
ehci_endpoint_disable waiting for the tt_clearing flag to reset:

<0>[   47.610967] usb 2-1.3: **** DPM device timeout ****
<7>[   47.610972]  f2f11c60 00000092 f2f11c0c c10624a5 00000003 f4c6e880 c1c8a4c0 c1c8a4c0
<7>[   47.610983]  15c55698 0000000b f56b34c0 f2a45b70 f4c6e880 00000082 f2a4602c f2f11c30
<7>[   47.610993]  c10787f8 f4cac000 f2a45b70 00000000 f4cac010 f2f11c58 00000046 00000001
<7>[   47.611004] Call Trace:
<7>[   47.611006]  [<c10624a5>] ? sched_clock_cpu+0xf5/0x160
<7>[   47.611019]  [<c10787f8>] ? lock_release_holdtime.part.22+0x88/0xf0
<7>[   47.611026]  [<c103ed46>] ? lock_timer_base.isra.35+0x26/0x50
<7>[   47.611034]  [<c17592d3>] ? schedule_timeout+0x133/0x290
<7>[   47.611044]  [<c175b43e>] schedule+0x1e/0x50
<7>[   47.611051]  [<c17592d8>] schedule_timeout+0x138/0x290
<7>[   47.611057]  [<c10624a5>] ? sched_clock_cpu+0xf5/0x160
<7>[   47.611063]  [<c103e560>] ? usleep_range+0x40/0x40
<7>[   47.611070]  [<c1759445>] schedule_timeout_uninterruptible+0x15/0x20
<7>[   47.611077]  [<c14935f4>] ehci_endpoint_disable+0x64/0x160
<7>[   47.611084]  [<c147d1ee>] ? usb_hcd_flush_endpoint+0x10e/0x1d0
<7>[   47.611092]  [<c1165663>] ? sysfs_add_file+0x13/0x20
<7>[   47.611100]  [<c147d5a9>] usb_hcd_disable_endpoint+0x29/0x40
<7>[   47.611107]  [<c147fafc>] usb_disable_endpoint+0x5c/0x80
<7>[   47.611111]  [<c147fb57>] usb_disable_interface+0x37/0x50
<7>[   47.611116]  [<c1477650>] usb_reset_and_verify_device+0x4b0/0x640
<7>[   47.611122]  [<c1474665>] ? hub_port_status+0xb5/0x100
<7>[   47.611129]  [<c147a975>] usb_port_resume+0xd5/0x220
<7>[   47.611136]  [<c148877f>] generic_resume+0xf/0x30
<7>[   47.611142]  [<c14821a3>] usb_resume+0x133/0x180
<7>[   47.611147]  [<c1473b10>] ? usb_dev_thaw+0x10/0x10
<7>[   47.611152]  [<c1473b1d>] usb_dev_resume+0xd/0x10
<7>[   47.611157]  [<c13baa60>] dpm_run_callback+0x40/0xb0
<7>[   47.611164]  [<c13bdb03>] ? pm_runtime_enable+0x43/0x70
<7>[   47.611171]  [<c13bafc6>] device_resume+0x1a6/0x2c0
<7>[   47.611177]  [<c13ba940>] ? dpm_show_time+0xe0/0xe0
<7>[   47.611183]  [<c13bb0f9>] async_resume+0x19/0x40
<7>[   47.611189]  [<c10580c4>] async_run_entry_fn+0x64/0x160
<7>[   47.611196]  [<c104a244>] ? process_one_work+0x104/0x480
<7>[   47.611203]  [<c104a24c>] ? process_one_work+0x10c/0x480
<7>[   47.611209]  [<c104a2c0>] process_one_work+0x180/0x480
<7>[   47.611215]  [<c104a244>] ? process_one_work+0x104/0x480
<7>[   47.611220]  [<c1058060>] ? async_schedule+0x10/0x10
<7>[   47.611226]  [<c104c15c>] worker_thread+0x11c/0x2f0
<7>[   47.611233]  [<c104c040>] ? manage_workers.isra.27+0x1f0/0x1f0
<7>[   47.611239]  [<c10507f8>] kthread+0x78/0x80
<7>[   47.611244]  [<c1750000>] ? timer_cpu_notify+0xd6/0x20d
<7>[   47.611253]  [<c1050780>] ? __init_kthread_worker+0x60/0x60
<7>[   47.611258]  [<c176357e>] kernel_thread_helper+0x6/0xd
<7>[   47.611283] ------------[ cut here ]------------

This patch changes hub_quiesce behavior to flush the TT clear work
instead of canceling it, to make sure that no TT clear request remains
uncompleted before suspend.

Signed-off-by: Octavian Purdila <>
Acked-by: Alan Stern <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agousb-storage: add unusual_devs entry for Casio EX-N1 digital camera
Michael Shigorin [Mon, 22 Oct 2012 09:18:56 +0000 (12:18 +0300)]
usb-storage: add unusual_devs entry for Casio EX-N1 digital camera

commit d7870af7e2e3a91b462075ec1ca669b482215187 upstream.

This commit sets removable subclass for Casio EX-N1 digital camera.

The patch has been tested within an ALT Linux kernel:;a=commitdiff;h=c0fd891836e89fe0c93a4d536a59216d90e4e3e7

See also

Signed-off-by: Oleksandr Chumachenko <>
Signed-off-by: Michael Shigorin <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoehci: Add yet-another Lucid nohandoff pci quirk
Anisse Astier [Tue, 9 Oct 2012 10:22:37 +0000 (12:22 +0200)]
ehci: Add yet-another Lucid nohandoff pci quirk

commit 8daf8b6086f9d575200cd0aa3797e26137255609 upstream.

Board name changed on another shipping Lucid tablet.

Signed-off-by: Anisse Astier <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions
Anisse Astier [Tue, 9 Oct 2012 10:22:36 +0000 (12:22 +0200)]
ehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions

commit c323dc023b9501e5d09582ec7efd1d40a9001d99 upstream.

BIOS vendors keep changing the BIOS versions. Only match the beginning
of the string to match all Lucid tablets with board name M11JB.

Signed-off-by: Anisse Astier <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agosysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
Geert Uytterhoeven [Sat, 29 Sep 2012 20:23:19 +0000 (22:23 +0200)]
sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()

commit 66081a72517a131430dcf986775f3268aafcb546 upstream.

The warning check for duplicate sysfs entries can cause a buffer overflow
when printing the warning, as strcat() doesn't check buffer sizes.
Use strlcat() instead.

Since strlcat() doesn't return a pointer to the passed buffer, unlike
strcat(), I had to convert the nested concatenation in sysfs_add_one() to
an admittedly more obscure comma operator construct, to avoid emitting code
for the concatenation if CONFIG_BUG is disabled.

Signed-off-by: Geert Uytterhoeven <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoSUNRPC: Prevent races in xs_abort_connection()
Trond Myklebust [Tue, 23 Oct 2012 21:50:07 +0000 (17:50 -0400)]
SUNRPC: Prevent races in xs_abort_connection()

commit 4bc1e68ed6a8b59be8a79eb719be515a55c7bc68 upstream.

The call to xprt_disconnect_done() that is triggered by a successful
connection reset will trigger another automatic wakeup of all tasks
on the xprt->pending rpc_wait_queue. In particular it will cause an
early wake up of the task that called xprt_connect().

All we really want to do here is clear all the socket-specific state
flags, so we split that functionality out of xs_sock_mark_closed()
into a helper that can be called by xs_abort_connection()

Reported-by: Chris Perl <>
Signed-off-by: Trond Myklebust <>
Tested-by: Chris Perl <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoRevert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
Trond Myklebust [Tue, 23 Oct 2012 15:40:02 +0000 (11:40 -0400)]
Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."

commit b9d2bb2ee537424a7f855e1f93eed44eb9ee0854 upstream.

This reverts commit 55420c24a0d4d1fce70ca713f84aa00b6b74a70e.
Now that we clear the connected flag when entering TCP_CLOSE_WAIT,
the deadlock described in this commit is no longer possible.
Instead, the resulting call to xs_tcp_shutdown() can interfere
with pending reconnection attempts.

Reported-by: Chris Perl <>
Signed-off-by: Trond Myklebust <>
Tested-by: Chris Perl <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoSUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT
Trond Myklebust [Tue, 23 Oct 2012 15:35:47 +0000 (11:35 -0400)]
SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT

commit d0bea455dd48da1ecbd04fedf00eb89437455fdc upstream.

This is needed to ensure that we call xprt_connect() upon the next
call to call_connect().

Signed-off-by: Trond Myklebust <>
Tested-by: Chris Perl <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoSUNRPC: Get rid of the xs_error_report socket callback
Trond Myklebust [Mon, 22 Oct 2012 21:14:36 +0000 (17:14 -0400)]
SUNRPC: Get rid of the xs_error_report socket callback

commit f878b657ce8e7d3673afe48110ec208a29e38c4a upstream.

Chris Perl reports that we're seeing races between the wakeup call in
xs_error_report and the connect attempts. Basically, Chris has shown
that in certain circumstances, the call to xs_error_report causes the
rpc_task that is responsible for reconnecting to wake up early, thus
triggering a disconnect and retry.

Since the sk->sk_error_report() calls in the socket layer are always
followed by a tcp_done() in the cases where we care about waking up
the rpc_tasks, just let the state_change callbacks take responsibility
for those wake ups.

Reported-by: Chris Perl <>
Signed-off-by: Trond Myklebust <>
Tested-by: Chris Perl <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count
Will Deacon [Fri, 19 Oct 2012 16:53:01 +0000 (17:53 +0100)]
ARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count

commit 5f40b909728ad784eb43aa309d3c4e9bdf050781 upstream.

When booting a secondary CPU, the primary CPU hands two sets of page
tables via the secondary_data struct:

(1) swapper_pg_dir: a normal, cacheable, shared (if SMP) mapping
    of the kernel image (i.e. the tables used by init_mm).

(2) idmap_pgd: an uncached mapping of the .idmap.text ELF

The idmap is generally used when enabling and disabling the MMU, which
includes early CPU boot. In this case, the secondary CPU switches to
swapper as soon as it enters C code:

struct mm_struct *mm = &init_mm;
unsigned int cpu = smp_processor_id();

 * All kernel threads share the same mm context; grab a
 * reference and switch to it.
current->active_mm = mm;
cpumask_set_cpu(cpu, mm_cpumask(mm));
cpu_switch_mm(mm->pgd, mm);

This causes a problem on ARMv7, where the identity mapping is treated as
strongly-ordered leading to architecturally UNPREDICTABLE behaviour of
exclusive accesses, such as those used by atomic_inc.

This patch re-orders the secondary_start_kernel function so that we
switch to swapper before performing any exclusive accesses.

Reported-by: Gilles Chanteperdrix <>
Cc: David McKay <>
Signed-off-by: Will Deacon <>
Signed-off-by: Russell King <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agogenalloc: stop crashing the system when destroying a pool
Thadeu Lima de Souza Cascardo [Thu, 25 Oct 2012 20:37:51 +0000 (13:37 -0700)]
genalloc: stop crashing the system when destroying a pool

commit eedce141cd2dad8d0cefc5468ef41898949a7031 upstream.

The genalloc code uses the bitmap API from include/linux/bitmap.h and
lib/bitmap.c, which is based on long values.  Both bitmap_set from
lib/bitmap.c and bitmap_set_ll, which is the lockless version from
genalloc.c, use BITMAP_LAST_WORD_MASK to set the first bits in a long in
the bitmap.

That one uses (1 << bits) - 1, 0b111, if you are setting the first three
bits.  This means that the API counts from the least significant bits
(LSB from now on) to the MSB.  The LSB in the first long is bit 0, then.
The same works for the lookup functions.

The genalloc code uses longs for the bitmap, as it should.  In
include/linux/genalloc.h, struct gen_pool_chunk has unsigned long
bits[0] as its last member.  When allocating the struct, genalloc should
reserve enough space for the bitmap.  This should be a proper number of
longs that can fit the amount of bits in the bitmap.

However, genalloc allocates an integer number of bytes that fit the
amount of bits, but may not be an integer amount of longs.  9 bytes, for
example, could be allocated for 70 bits.

This is a problem in itself if the Least Significat Bit in a long is in
the byte with the largest address, which happens in Big Endian machines.
This means genalloc is not allocating the byte in which it will try to
set or check for a bit.

This may end up in memory corruption, where genalloc will try to set the
bits it has not allocated.  In fact, genalloc may not set these bits
because it may find them already set, because they were not zeroed since
they were not allocated.  And that's what causes a BUG when
gen_pool_destroy is called and check for any set bits.

What really happens is that genalloc uses kmalloc_node with __GFP_ZERO
on gen_pool_add_virt.  With SLAB and SLUB, this means the whole slab
will be cleared, not only the requested bytes.  Since struct
gen_pool_chunk has a size that is a multiple of 8, and slab sizes are
multiples of 8, we get lucky and allocate and clear the right amount of

Hower, this is not the case with SLOB or with older code that did memset
after allocating instead of using __GFP_ZERO.

So, a simple module as this (running 3.6.0), will cause a crash when

  [root@phantom-lp2 foo]# cat foo.c
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
  #include <linux/genalloc.h>


  static struct gen_pool *foo_pool;

  static __init int foo_init(void)
          int ret;
          foo_pool = gen_pool_create(10, -1);
          if (!foo_pool)
                  return -ENOMEM;
          ret = gen_pool_add(foo_pool, 0xa0000000, 32 << 10, -1);
          if (ret) {
                  return ret;
          return 0;

  static __exit void foo_exit(void)

  [root@phantom-lp2 foo]# zcat /proc/config.gz | grep SLOB
  [root@phantom-lp2 foo]# insmod ./foo.ko
  [root@phantom-lp2 foo]# rmmod foo
  ------------[ cut here ]------------
  kernel BUG at lib/genalloc.c:243!
  cpu 0x4: Vector: 700 (Program Check) at [c0000000bb0e7960]
      pc: c0000000003cb50c: .gen_pool_destroy+0xac/0x110
      lr: c0000000003cb4fc: .gen_pool_destroy+0x9c/0x110
      sp: c0000000bb0e7be0
     msr: 8000000000029032
    current = 0xc0000000bb0e0000
    paca    = 0xc000000006d30e00   softe: 0        irq_happened: 0x01
      pid   = 13044, comm = rmmod
  kernel BUG at lib/genalloc.c:243!
  [c0000000bb0e7ca0d000000004b00020 .foo_exit+0x20/0x38 [foo]
  [c0000000bb0e7d20c0000000000dff98 .SyS_delete_module+0x1a8/0x290
  [c0000000bb0e7e30c0000000000097d4 syscall_exit+0x0/0x94
  --- Exception: c00 (System Call) at 000000800753d1a0
  SP (fffd0b0e640) is in userspace

Signed-off-by: Thadeu Lima de Souza Cascardo <>
Cc: Paul Gortmaker <>
Cc: Benjamin Gaignard <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agodrivers/rtc/rtc-imxdi.c: add missing spin lock initialization
Jan Luebbe [Thu, 25 Oct 2012 20:38:11 +0000 (13:38 -0700)]
drivers/rtc/rtc-imxdi.c: add missing spin lock initialization

commit fee0de7791f967c2c5f0d43eb7b7261761b45e64 upstream.

Signed-off-by: Jan Luebbe <>
Cc: Alessandro Zummo <>
Cc: Roland Stigge <>
Cc: Grant Likely <>
Tested-by: Roland Stigge <>
Cc: Sascha Hauer <>
Cc: Russell King <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agofs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
Kees Cook [Thu, 25 Oct 2012 20:38:16 +0000 (13:38 -0700)]
fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check

commit 12176503366885edd542389eed3aaf94be163fdb upstream.

The compat ioctl for VIDEO_SET_SPU_PALETTE was missing an error check
while converting ioctl arguments.  This could lead to leaking kernel
stack contents into userspace.

Patch extracted from existing fix in grsecurity.

Signed-off-by: Kees Cook <>
Cc: David Miller <>
Cc: Brad Spengler <>
Cc: PaX Team <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agogen_init_cpio: avoid stack overflow when expanding
Kees Cook [Thu, 25 Oct 2012 20:38:14 +0000 (13:38 -0700)]
gen_init_cpio: avoid stack overflow when expanding

commit 20f1de659b77364d55d4e7fad2ef657e7730323f upstream.

Fix possible overflow of the buffer used for expanding environment
variables when building file list.

In the extremely unlikely case of an attacker having control over the
environment variables visible to gen_init_cpio, control over the
contents of the file gen_init_cpio parses, and gen_init_cpio was built
without compiler hardening, the attacker can gain arbitrary execution
control via a stack buffer overflow.

  $ cat usr/crash.list
  file foo ${BIG}${BIG}${BIG}${BIG}${BIG}${BIG} 0755 0 0
  $ BIG=$(perl -e 'print "A" x 4096;') ./usr/gen_init_cpio usr/crash.list
  *** buffer overflow detected ***: ./usr/gen_init_cpio terminated

This also replaces the space-indenting with tabs.

Patch based on existing fix extracted from grsecurity.

Signed-off-by: Kees Cook <>
Cc: Michal Marek <>
Cc: Brad Spengler <>
Cc: PaX Team <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>
6 years ago- patches.suse/SoN-0018-mm-swap-Implement-generic-handlers-for-swap-related-fix-2...
Mel Gorman [Wed, 31 Oct 2012 15:16:26 +0000 (15:16 +0000)]
- patches.suse/SoN-0018-mm-swap-Implement-generic-handlers-for-swap-related-fix-2.patch:
  mm: swap: Implement generic handlers for swap-related address ops fix.

suse-commit: 6d7c733fca57084891479e858f9f8ff701cdd3c2

6 years ago- patches.fixes/mm-Fix-XFS-oops-due-to-dirty-pages-without-buffers-o.patch:
Jan Kara [Wed, 31 Oct 2012 11:06:04 +0000 (12:06 +0100)]
- patches.fixes/mm-Fix-XFS-oops-due-to-dirty-pages-without-buffers-o.patch:
  mm: Fix XFS oops due to dirty pages without buffers on s390

suse-commit: 39b5bad32ca9616fa5450546fbfa455a60678084

6 years ago- patches.fixes/kvm-KVM-Clean-up-error-handling-during-VCPU-creation.patch:
Bruce Rogers [Tue, 30 Oct 2012 19:40:41 +0000 (13:40 -0600)]
- patches.fixes/kvm-KVM-Clean-up-error-handling-during-VCPU-creation.patch:
  KVM: Clean up error handling during VCPU creation (bnc#754898
- patches.fixes/kvm-KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch:
  KVM: Ensure all vcpus are consistent with in-kernel irqchip
  settings (bnc#754898 CVE-2012-1601).

suse-commit: 9d4477269fea72272a21fee9bd4f907a6bd0bc54

6 years ago- patches.drivers/hpwdt_only_byte_reads_writes.patch: hpwdt:
Petr Tesarik [Tue, 30 Oct 2012 14:03:09 +0000 (15:03 +0100)]
- patches.drivers/hpwdt_only_byte_reads_writes.patch: hpwdt:
  Only BYTE reads/writes to WD Timer port 0x72.

suse-commit: 99a94ed532502bd877d1786ae5fa9cf4d4d5d0aa

6 years ago- Linux 3.0.49 (bnc#722560).
Jiri Slaby [Mon, 29 Oct 2012 14:40:03 +0000 (15:40 +0100)]
- Linux 3.0.49 (bnc#722560).
- patches.drivers/USB3-0148-xHCI-test-USB2-software-LPM.patch:
- patches.drivers/USB3-0152-xHCI-fix-debug-message.patch: Refresh.
- patches.drivers/USB3-0158-usb-xhci-move-xhci_gen_setup-away-from-pci.patch:
- patches.fixes/0001-USB-fix-resource-leak-in-xhci-power-loss-path.patch:
- patches.fixes/xhci-Don-t-free-endpoints-in-xhci_mem_cleanup:
- patches.kabi/revert-net-fix-NULL-dereferences-in-check_peer_redir.patch:
- patches.drivers/drm-i915-apply-timing-generator-bug-workaround-on-CP:

suse-commit: 1f23eb1f7833396c7bc1e62bef0d0804e2d8a731

6 years ago- Linux 3.0.48.
Jiri Slaby [Mon, 29 Oct 2012 14:24:57 +0000 (15:24 +0100)]
- Linux 3.0.48.

suse-commit: d096d32b6af06d7a2d3efb1fc6a0ecc1e962a277

6 years ago- Linux 3.0.47 (bnc#731739).
Jiri Slaby [Mon, 22 Oct 2012 09:26:48 +0000 (11:26 +0200)]
- Linux 3.0.47 (bnc#731739).
- patches.drivers/0184-tg3-Remove-40BIT_DMA_LIMIT_BUG.patch:
- patches.drivers/0185-tg3-Remove-4G_DMA_BNDRY_BUG-flag.patch:
- patches.drivers/tg3-break-larger-frags-into-4k-chunks-for-5719:
- patches.fixes/x86_acer_acpi_ec_call_reg_blacklist.patch:
- patches.suse/0001-Revert-x86-random-Verify-RDRAND-functionality-and-al.patch:
  Revert "x86, random: Verify RDRAND functionality and allow it
  to be disabled".
- patches.suse/0002-Revert-x86-random-Architectural-inlines-to-get-rando.patch:
  Revert "x86, random: Architectural inlines to get random
  integers with RDRAND".
- patches.drivers/drm-radeon-fix-panic-on-unload.patch: Delete.
- Update config files.

suse-commit: b752562855ccffdc272f377f4f1e663a09f71d86

6 years ago- patches.xen/1198-xenbus-dev-write-buflen.patch: xenbus: fix
Jan Beulich [Mon, 29 Oct 2012 08:30:29 +0000 (09:30 +0100)]
- patches.xen/1198-xenbus-dev-write-buflen.patch: xenbus: fix
  overflow check in xenbus_dev_write().
- patches.xen/1202-x86-signal-eip-corruption.patch: x86: don't
  corrupt %eip when returning from a signal handler.
- Update Xen patches to 3.0.46.

suse-commit: 16e75e28aa63ab8ee95a9c1bba1fc26691e79248

6 years agoLinux 3.0.49
Greg Kroah-Hartman [Sun, 28 Oct 2012 17:03:00 +0000 (10:03 -0700)]
Linux 3.0.49

6 years agoxHCI: handle command after aborting the command ring
Elric Fu [Wed, 27 Jun 2012 08:55:43 +0000 (16:55 +0800)]
xHCI: handle command after aborting the command ring

commit b63f4053cc8aa22a98e3f9a97845afe6c15d0a0d upstream.

According to xHCI spec section and section,
after aborting a command on the command ring, xHC will
generate a command completion event with its completion
code set to Command Ring Stopped at least. If a command is
currently executing at the time of aborting a command, xHC
also generate a command completion event with its completion
code set to Command Abort. When the command ring is stopped,
software may remove, add, or rearrage Command Descriptors.

To cancel a command, software will initialize a command
descriptor for the cancel command, and add it into a
cancel_cmd_list of xhci. When the command ring is stopped,
software will find the command trbs described by command
descriptors in cancel_cmd_list and modify it to No Op
command. If software can't find the matched trbs, we can
think it had been finished.

This patch should be backported to kernels as old as 3.0, that contain
the commit 7ed603ecf8b68ab81f4c83097d3063d43ec73bb8 "xhci: Add an
assertion to check for virt_dev=0 bug." That commit papers over a NULL
pointer dereference, and this patch fixes the underlying issue that
caused the NULL pointer dereference.

Note from Sarah: The TRB_TYPE_LINK_LE32 macro is not in the 3.0 stable
kernel, so I added it to this patch.

Signed-off-by: Elric Fu <>
Signed-off-by: Sarah Sharp <>
Tested-by: Miroslav Sabljic <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoxHCI: cancel command after command timeout
Elric Fu [Wed, 27 Jun 2012 08:31:52 +0000 (16:31 +0800)]
xHCI: cancel command after command timeout

commit 6e4468b9a0793dfb53eb80d9fe52c739b13b27fd upstream.

The patch is used to cancel command when the command isn't
acknowledged and a timeout occurs.

This patch should be backported to kernels as old as 3.0, that contain
the commit 7ed603ecf8b68ab81f4c83097d3063d43ec73bb8 "xhci: Add an
assertion to check for virt_dev=0 bug." That commit papers over a NULL
pointer dereference, and this patch fixes the underlying issue that
caused the NULL pointer dereference.

Signed-off-by: Elric Fu <>
Signed-off-by: Sarah Sharp <>
Tested-by: Miroslav Sabljic <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoxHCI: add aborting command ring function
Elric Fu [Wed, 27 Jun 2012 08:31:12 +0000 (16:31 +0800)]
xHCI: add aborting command ring function

commit b92cc66c047ff7cf587b318fe377061a353c120f upstream.

Software have to abort command ring and cancel command
when a command is failed or hang. Otherwise, the command
ring will hang up and can't handle the others. An example
of a command that may hang is the Address Device Command,
because waiting for a SET_ADDRESS request to be acknowledged
by a USB device is outside of the xHC's ability to control.

To cancel a command, software will initialize a command
descriptor for the cancel command, and add it into a
cancel_cmd_list of xhci.

Sarah: Fixed missing newline on "Have the command ring been stopped?"
debugging statement.

This patch should be backported to kernels as old as 3.0, that contain
the commit 7ed603ecf8b68ab81f4c83097d3063d43ec73bb8 "xhci: Add an
assertion to check for virt_dev=0 bug." That commit papers over a NULL
pointer dereference, and this patch fixes the underlying issue that
caused the NULL pointer dereference.

Signed-off-by: Elric Fu <>
Signed-off-by: Sarah Sharp <>
Tested-by: Miroslav Sabljic <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoxHCI: add cmd_ring_state
Elric Fu [Wed, 27 Jun 2012 08:30:57 +0000 (16:30 +0800)]
xHCI: add cmd_ring_state

commit c181bc5b5d5c79b71203cd10cef97f802fb6f9c1 upstream.

Adding cmd_ring_state for command ring. It helps to verify
the current command ring state for controlling the command
ring operations.

This patch should be backported to kernels as old as 3.0.  The commit
7ed603ecf8b68ab81f4c83097d3063d43ec73bb8 "xhci: Add an assertion to
check for virt_dev=0 bug." papers over the NULL pointer dereference that
I now believe is related to a timed out Set Address command.  This (and
the four patches that follow it) contain the real fix that also allows
VIA USB 3.0 hubs to consistently re-enumerate during the plug/unplug
stress tests.

Signed-off-by: Elric Fu <>
Signed-off-by: Sarah Sharp <>
Tested-by: Miroslav Sabljic <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agosparc64: Be less verbose during vmemmap population.
David S. Miller [Wed, 15 Aug 2012 07:37:29 +0000 (00:37 -0700)]
sparc64: Be less verbose during vmemmap population.

[ Upstream commit 2856cc2e4d0852c3ddaae9dcb19cb9396512eb08 ]

On a 2-node machine with 256GB of ram we get 512 lines of
console output, which is just too much.

This mimicks Yinghai Lu's x86 commit c2b91e2eec9678dbda274e906cc32ea8f711da3b
(x86_64/mm: check and print vmemmap allocation continuous) except that
we aren't ever going to get contiguous block pointers in between calls
so just print when the virtual address or node changes.

This decreases the output by an order of 16.

Also demote this to KERN_DEBUG.

Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agosparc64: do not clobber personality flags in sys_sparc64_personality()
Jiri Kosina [Wed, 1 Aug 2012 19:10:51 +0000 (21:10 +0200)]
sparc64: do not clobber personality flags in sys_sparc64_personality()

[ Upstream commit a27032eee8cb6e16516f13c8a9752e9d5d4cc430 ]

There are multiple errors in how sys_sparc64_personality() handles
personality flags stored in top three bytes.

- directly comparing current->personality against PER_LINUX32 doesn't work
  in cases when any of the personality flags stored in the top three bytes
  are used.
- directly forcefully setting personality to PER_LINUX32 or PER_LINUX
  discards any flags stored in the top three bytes

Fix the first one by properly using personality() macro to compare only
PER_MASK bytes.
Fix the second one by setting only the bits that should be set, instead of
overwriting the whole value.

Signed-off-by: Jiri Kosina <>
Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agosparc64: Fix bit twiddling in sparc_pmu_enable_event().
David S. Miller [Tue, 16 Oct 2012 20:05:25 +0000 (13:05 -0700)]
sparc64: Fix bit twiddling in sparc_pmu_enable_event().

[ Upstream commit e793d8c6740f8fe704fa216e95685f4d92c4c4b9 ]

There was a serious disconnect in the logic happening in
sparc_pmu_disable_event() vs. sparc_pmu_enable_event().

Event disable is implemented by programming a NOP event into the PCR.

However, event enable was not reversing this operation.  Instead, it
was setting the User/Priv/Hypervisor trace enable bits.

That's not sparc_pmu_enable_event()'s job, that's what
sparc_pmu_enable() and sparc_pmu_disable() do .

The intent of sparc_pmu_enable_event() is clear, since it first clear
out the event type encoding field.  So fix this by OR'ing in the event
encoding rather than the trace enable bits.

Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agosparc64: Like x86 we should check current->mm during perf backtrace generation.
David S. Miller [Mon, 15 Oct 2012 00:59:40 +0000 (17:59 -0700)]
sparc64: Like x86 we should check current->mm during perf backtrace generation.

[ Upstream commit 08280e6c4c2e8049ac61d9e8e3536ec1df629c0d ]

If the MM is not active, only report the top-level PC.  Do not try to
access the address space.

Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agosparc64: fix ptrace interaction with force_successful_syscall_return()
Al Viro [Thu, 11 Oct 2012 00:25:00 +0000 (17:25 -0700)]
sparc64: fix ptrace interaction with force_successful_syscall_return()

[ Upstream commit 55c2770e413e96871147b9406a9c41fe9bc5209c ]

we want syscall_trace_leave() called on exit from any syscall;
skipping its call in case we'd done force_successful_syscall_return()
is broken...

Signed-off-by: Al Viro <>
Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agotcp: resets are misrouted
Alexey Kuznetsov [Fri, 12 Oct 2012 04:34:17 +0000 (04:34 +0000)]
tcp: resets are misrouted

[ Upstream commit 4c67525849e0b7f4bd4fab2487ec9e43ea52ef29 ]

After commit e2446eaa ("tcp_v4_send_reset: binding oif to iif in no
sock case").. tcp resets are always lost, when routing is asymmetric.
Yes, backing out that patch will result in misrouting of resets for
dead connections which used interface binding when were alive, but we
actually cannot do anything here.  What's died that's died and correct
handling normal unbound connections is obviously a priority.

Comment to comment:
> This has few benefits:
>   1. tcp_v6_send_reset already did that.

It was done to route resets for IPv6 link local addresses. It was a
mistake to do so for global addresses. The patch fixes this as well.

Actually, the problem appears to be even more serious than guaranteed
loss of resets.  As reported by Sergey Soloviev <>, those
misrouted resets create a lot of arp traffic and huge amount of
unresolved arp entires putting down to knees NAT firewalls which use
asymmetric routing.

Signed-off-by: Alexey Kuznetsov <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoRDS: fix rds-ping spinlock recursion
jeff.liu [Mon, 8 Oct 2012 18:57:27 +0000 (18:57 +0000)]
RDS: fix rds-ping spinlock recursion

[ Upstream commit 5175a5e76bbdf20a614fb47ce7a38f0f39e70226 ]

This is the revised patch for fixing rds-ping spinlock recursion
according to Venkat's suggestions.

RDS ping/pong over TCP feature has been broken for years(2.6.39 to
3.6.0) since we have to set TCP cork and call kernel_sendmsg() between
ping/pong which both need to lock "struct sock *sk". However, this
lock has already been hold before rds_tcp_data_ready() callback is
triggerred. As a result, we always facing spinlock resursion which
would resulting in system panic.

Given that RDS ping is only used to test the connectivity and not for
serious performance measurements, we can queue the pong transmit to
rds_wq as a delayed response.

Reported-by: Dan Carpenter <>
CC: Venkat Venkatsubra <>
CC: David S. Miller <>
CC: James Morris <>
Signed-off-by: Jie Liu <>
Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoskge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard
Graham Gower [Mon, 8 Oct 2012 08:34:50 +0000 (08:34 +0000)]
skge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard

[ Upstream commit a2af139ff1cd85df586690ff626619ab1ee88b0a ]

Marvell 88E8001 on an ASUS P5NSLI motherboard is unable to send/receive
packets on a system with >4gb ram unless a 32bit DMA mask is used.

This issue has been around for years and a fix was sent 3.5 years ago, but
there was some debate as to whether it should instead be fixed as a PCI quirk.

However, 18 months later a similar workaround was introduced for another
chipset exhibiting the same problem.

Signed-off-by: Graham Gower <>
Signed-off-by: Jan Ceuleers <>
Acked-by: Stephen Hemminger <>
Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agonet: Fix skb_under_panic oops in neigh_resolve_output [Fri, 5 Oct 2012 19:10:15 +0000 (19:10 +0000)]
net: Fix skb_under_panic oops in neigh_resolve_output

[ Upstream commit e1f165032c8bade3a6bdf546f8faf61fda4dd01c ]

The retry loop in neigh_resolve_output() and neigh_connected_output()
call dev_hard_header() with out reseting the skb to network_header.
This causes the retry to fail with skb_under_panic. The fix is to
reset the network_header within the retry loop.

Signed-off-by: Ramesh Nagappa <>
Reviewed-by: Shawn Lu <>
Reviewed-by: Robert Coulson <>
Reviewed-by: Billie Alsup <>
Signed-off-by: David S. Miller <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agodrm/i915: apply timing generator bug workaround on CPT and PPT
Jesse Barnes [Wed, 27 Jul 2011 18:51:40 +0000 (11:51 -0700)]
drm/i915: apply timing generator bug workaround on CPT and PPT

commit 3bcf603f6d5d18bd9d076dc280de71f48add4101 upstream.

On CougarPoint and PantherPoint PCH chips, the timing generator may fail
to start after DP training completes.  This is due to a bug in the
FDI autotraining detect logic (which will stall the timing generator and
re-enable it once training completes), so disable it to avoid silent DP
mode setting failures.

Signed-off-by: Jesse Barnes <>
Signed-off-by: Keith Packard <>
Signed-off-by: Timo Aaltonen <>
6 years agomedia: au0828: fix case where STREAMOFF being called on stopped stream causes BUG()
Devin Heitmueller [Tue, 7 Aug 2012 01:47:03 +0000 (22:47 -0300)]
media: au0828: fix case where STREAMOFF being called on stopped stream causes BUG()

commit a595c1ce4c9d572cf53513570b9f1a263d7867f2 upstream.

We weren't checking whether the resource was in use before calling
res_free(), so applications which called STREAMOFF on a v4l2 device that
wasn't already streaming would cause a BUG() to be hit (MythTV).

Reported-by: Larry Finger <>
Reported-by: Jay Harbeston <>
Signed-off-by: Devin Heitmueller <>
Signed-off-by: Mauro Carvalho Chehab <>
6 years agoamd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
Andrew Morton [Tue, 23 Oct 2012 21:09:39 +0000 (14:09 -0700)]
amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]

commit 168bfeef7bba3f9784f7540b053e4ac72b769ce9 upstream.

If none of the elements in scrubrates[] matches, this loop will cause
__amd64_set_scrub_rate() to incorrectly use the n+1th element.

As the function is designed to use the final scrubrates[] element in the
case of no match, we can fix this bug by simply terminating the array
search at the n-1th element.

Boris: this code is fragile anyway, see here why:

It will be rewritten more robustly soonish.

Reported-by: Denis Kirjanov <>
Cc: Doug Thompson <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Borislav Petkov <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agocgroup: notify_on_release may not be triggered in some cases
Daisuke Nishimura [Thu, 4 Oct 2012 07:37:16 +0000 (16:37 +0900)]
cgroup: notify_on_release may not be triggered in some cases

commit 1f5320d5972aa50d3e8d2b227b636b370e608359 upstream.

notify_on_release must be triggered when the last process in a cgroup is
move to another. But if the first(and only) process in a cgroup is moved to
another, notify_on_release is not triggered.

# mkdir /cgroup/cpu/SRC
# mkdir /cgroup/cpu/DST
# echo 1 >/cgroup/cpu/SRC/notify_on_release
# echo 1 >/cgroup/cpu/DST/notify_on_release
# sleep 300 &
[1] 8629
# echo 8629 >/cgroup/cpu/SRC/tasks
# echo 8629 >/cgroup/cpu/DST/tasks
-> notify_on_release for /SRC must be triggered at this point,
   but it isn't.

This is because put_css_set() is called before setting CGRP_RELEASABLE
in cgroup_task_migrate(), and is a regression introduce by the
commit:74a1166d(cgroups: make procs file writable), which was merged
into v3.0.

Acked-by: Li Zefan <>
Cc: Ben Blum <>
Signed-off-by: Daisuke Nishimura <>
Signed-off-by: Tejun Heo <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: option: add more ZTE devices
Bjørn Mork [Thu, 18 Oct 2012 15:14:17 +0000 (17:14 +0200)]
USB: option: add more ZTE devices

commit 4b35f1c52943851b310afb09047bfe991ac8f5ae upstream.

Signed-off-by: Bjørn Mork <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: option: blacklist net interface on ZTE devices
Bjørn Mork [Thu, 18 Oct 2012 15:19:53 +0000 (17:19 +0200)]
USB: option: blacklist net interface on ZTE devices

commit 1452df6f1b7e396d89c2a1fdbdc0e0e839f97671 upstream.

Based on information from the ZTE Windows drivers.

Signed-off-by: Bjørn Mork <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agousb: acm: fix the computation of the number of data bits
Nicolas Boullis [Mon, 15 Oct 2012 22:06:23 +0000 (00:06 +0200)]
usb: acm: fix the computation of the number of data bits

commit 301a29da6e891e7eb95c843af0ecdbe86d01f723 upstream.

The current code assumes that CSIZE is 0000060, which appears to be
wrong on some arches (such as powerpc).

Signed-off-by: Nicolas Boullis <>
Acked-by: Oliver Neukum <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoUSB: cdc-acm: fix pipe type of write endpoint
Ming Lei [Tue, 16 Oct 2012 13:21:21 +0000 (21:21 +0800)]
USB: cdc-acm: fix pipe type of write endpoint

commit c5211187f7ff8e8dbff4ebf7c011ac4c0ffe319c upstream.

If the write endpoint is interrupt type, usb_sndintpipe() should
be passed to usb_fill_int_urb() instead of usb_sndbulkpipe().

Signed-off-by: Ming Lei <>
Cc: Oliver Neukum <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoxen/x86: don't corrupt %eip when returning from a signal handler
David Vrabel [Fri, 19 Oct 2012 16:29:07 +0000 (17:29 +0100)]
xen/x86: don't corrupt %eip when returning from a signal handler

commit a349e23d1cf746f8bdc603dcc61fae9ee4a695f6 upstream.

In 32 bit guests, if a userspace process has %eax == -ERESTARTSYS
(-512) or -ERESTARTNOINTR (-513) when it is interrupted by an event
/and/ the process has a pending signal then %eip (and %eax) are
corrupted when returning to the main process after handling the
signal.  The application may then crash with SIGSEGV or a SIGILL or it
may have subtly incorrect behaviour (depending on what instruction it
returned to).

The occurs because handle_signal() is incorrectly thinking that there
is a system call that needs to restarted so it adjusts %eip and %eax
to re-execute the system call instruction (even though user space had
not done a system call).

(-516) then handle_signal() only corrupted %eax (by setting it to
-EINTR).  This may cause the application to crash or have incorrect

handle_signal() assumes that regs->orig_ax >= 0 means a system call so
any kernel entry point that is not for a system call must push a
negative value for orig_ax.  For example, for physical interrupts on
bare metal the inverse of the vector is pushed and page_fault() sets
regs->orig_ax to -1, overwriting the hardware provided error code.

xen_hypervisor_callback() was incorrectly pushing 0 for orig_ax
instead of -1.

Classic Xen kernels pushed %eax which works as %eax cannot be both
non-negative and -RESTARTSYS (etc.), but using -1 is consistent with
other non-system call entry points and avoids some of the tests in

There were similar bugs in xen_failsafe_callback() of both 32 and
64-bit guests. If the fault was corrected and the normal return path
was used then 0 was incorrectly pushed as the value for orig_ax.

Signed-off-by: David Vrabel <>
Acked-by: Jan Beulich <>
Acked-by: Ian Campbell <>
Signed-off-by: Konrad Rzeszutek Wilk <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agox86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
Jacob Shin [Thu, 20 Oct 2011 21:15:26 +0000 (16:15 -0500)]
x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.

commit 1bbbbe779aabe1f0768c2bf8f8c0a5583679b54a upstream.

On systems with very large memory (1 TB in our case), BIOS may report a
reserved region or a hole in the E820 map, even above the 4 GB range. Exclude
these from the direct mapping.

[ hpa: this should be done not just for > 4 GB but for everything above the legacy
  region (1 MB), at the very least.  That, however, turns out to require significant
  restructuring.  That work is well underway, but is not suitable for rc/stable. ]

Signed-off-by: Jacob Shin <>
Signed-off-by: H. Peter Anvin <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agouse clamp_t in UNAME26 fix
Kees Cook [Sat, 20 Oct 2012 01:45:53 +0000 (18:45 -0700)]
use clamp_t in UNAME26 fix

commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream.

The min/max call needed to have explicit types on some architectures
(e.g. mn10300). Use clamp_t instead to avoid the warning:

  kernel/sys.c: In function 'override_release':
  kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]

Reported-by: Fengguang Wu <>
Signed-off-by: Kees Cook <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agokernel/sys.c: fix stack memory content leak via UNAME26
Kees Cook [Fri, 19 Oct 2012 20:56:51 +0000 (13:56 -0700)]
kernel/sys.c: fix stack memory content leak via UNAME26

commit 2702b1526c7278c4d65d78de209a465d4de2885e upstream.

Calling uname() with the UNAME26 personality set allows a leak of kernel
stack contents.  This fixes it by defensively calculating the length of
copy_to_user() call, making the len argument unsigned, and initializing
the stack buffer to zero (now technically unneeded, but hey, overkill).


Reported-by: PaX Team <>
Signed-off-by: Kees Cook <>
Cc: Andi Kleen <>
Cc: PaX Team <>
Cc: Brad Spengler <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agopcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
Arnd Bergmann [Mon, 30 Apr 2012 13:50:56 +0000 (13:50 +0000)]
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops

commit fdc858a466b738d35d3492bc7cf77b1dac98bf7c upstream.

The sharpsl_pcmcia_ops structure gets passed into
sa11xx_drv_pcmcia_probe, where it gets accessed at run-time,
unlike all other pcmcia drivers that pass their structures
into platform_device_add_data, which makes a copy.

This means the gcc warning is valid and the structure
must not be marked as __initdata.

Without this patch, building collie_defconfig results in:

drivers/pcmcia/pxa2xx_sharpsl.c:22:31: fatal error: mach-pxa/hardware.h: No such file or directory
compilation terminated.
make[3]: *** [drivers/pcmcia/pxa2xx_sharpsl.o] Error 1
make[2]: *** [drivers/pcmcia] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

Signed-off-by: Arnd Bergmann <>
Cc: Dominik Brodowski <>
Cc: Russell King <>
Cc: Pavel Machek <>
Cc: Jochen Friedrich <>
Signed-off-by: Greg Kroah-Hartman <>
6 years agoRevert: lockd: use rpc client's cl_nodename for id encoding
Greg Kroah-Hartman [Tue, 18 Sep 2012 09:37:18 +0000 (13:37 +0400)]
Revert: lockd: use rpc client's cl_nodename for id encoding

This reverts 12d63702c53bc2230dfc997e91ca891f39cb6446 which was commit
303a7ce92064c285a04c870f2dc0192fdb2968cb upstream.

Taking hostname from uts namespace if not safe, because this cuold be
performind during umount operation on child reaper death. And in this case
current->nsproxy is NULL already.

Signed-off-by: Greg Kroah-Hartman <>
Cc: Stanislav Kinsbursky <>
Cc: Trond Myklebust <>
6 years agoSUNRPC: Prevent kernel stack corruption on long values of flush
Sasha Levin [Mon, 16 Jul 2012 22:01:26 +0000 (00:01 +0200)]
SUNRPC: Prevent kernel stack corruption on long values of flush

commit 212ba90696ab4884e2025b0b13726d67aadc2cd4 upstream.

The buffer size in read_flush() is too small for the longest possible values
for it. This can lead to a kernel stack corruption:

[   43.047329] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: ffffffff833e64b4
[   43.047329]
[   43.049030] Pid: 6015, comm: trinity-child18 Tainted: G        W    3.5.0-rc7-next-20120716-sasha #221
[   43.050038] Call Trace:
[   43.050435]  [<ffffffff836c60c2>] panic+0xcd/0x1f4
[   43.050931]  [<ffffffff833e64b4>] ? read_flush.isra.7+0xe4/0x100
[   43.051602]  [<ffffffff810e94e6>] __stack_chk_fail+0x16/0x20
[   43.052206]  [<ffffffff833e64b4>] read_flush.isra.7+0xe4/0x100
[   43.052951]  [<ffffffff833e6500>] ? read_flush_pipefs+0x30/0x30
[   43.053594]  [<ffffffff833e652c>] read_flush_procfs+0x2c/0x30
[   43.053596]  [<ffffffff812b9a8c>] proc_reg_read+0x9c/0xd0
[   43.053596]  [<ffffffff812b99f0>] ? proc_reg_write+0xd0/0xd0
[   43.053596]  [<ffffffff81250d5b>] do_loop_readv_writev+0x4b/0x90
[   43.053596]  [<ffffffff81250fd6>] do_readv_writev+0xf6/0x1d0
[   43.053596]  [<ffffffff812510ee>] vfs_readv+0x3e/0x60
[   43.053596]  [<ffffffff812511b8>] sys_readv+0x48/0xb0
[   43.053596]  [<ffffffff8378167d>] system_call_fastpath+0x1a/0x1f

Signed-off-by: Sasha Levin <>
Signed-off-by: J. Bruce Fields <>
Signed-off-by: Greg Kroah-Hartman <>