commit 118326e940bdecef6c459d42ccf05256ba86daa7 tree 13b1e48f4f3700603ed258c41e9e39978babf5ee parent 68f66feb300423bb9ee5daecb1951af394425a38 author Peter Osterlund Sat, 14 May 2005 00:58:30 -0700 committer Greg KH Mon, 16 May 2005 21:07:31 -0700 [PATCH] Fix root hole in pktcdvd ioctl_by_bdev may only be used INSIDE the kernel. If the "arg" argument refers to memory that is accessed by put_user/get_user in the ioctl function, the memory needs to be in the kernel address space (that's the set_fs(KERNEL_DS) doing in the ioctl_by_bdev). This works on i386 because even with set_fs(KERNEL_DS) the user space memory is still accessible with put_user/get_user. That is not true for s390. In short the ioctl implementation of the pktcdvd device driver is horribly broken. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 68f66feb300423bb9ee5daecb1951af394425a38 tree ae5ce87f061f76da06cb78ce5c9cf3c8284fc0fc parent a84a505956f5c795a9ab3d60d97b6b91a27aa571 author Stephen Tweedie Fri, 13 May 2005 23:31:19 -0400 committer Greg KH Mon, 16 May 2005 21:07:21 -0700 [PATCH] Fix root hole in raw device [Patch] Fix raw device ioctl pass-through Raw character devices are supposed to pass ioctls through to the block devices they are bound to. Unfortunately, they are using the wrong function for this: ioctl_by_bdev(), instead of blkdev_ioctl(). ioctl_by_bdev() performs a set_fs(KERNEL_DS) before calling the ioctl, redirecting the user-space buffer access to the kernel address space. This is, needless to say, a bad thing. This was noticed first on s390, where raw IO was non-functioning. The s390 driver config does not actually allow raw IO to be enabled, which was the first part of the problem. Secondly, the s390 kernel address space is distinct from user, causing legal raw ioctls to fail. I've reproduced this on a kernel built with 4G:4G split on x86, which fails in the same way (-EFAULT if the address does not exist kernel-side; returns success without actually populating the user buffer if it does.) The patch below fixes both the config and address-space problems. It's based closely on a patch by Jan Glauber , which has been tested on s390 at IBM. I've tested it on x86 4G:4G (split address space) and x86_64 (common address space). Kernel-address-space access has been assigned CAN-2005-1264. Signed-off-by: Stephen Tweedie Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit a84a505956f5c795a9ab3d60d97b6b91a27aa571 tree 440fdf47fcddf8b0d615667b418981a511d16e30 parent d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 author Greg Kroah-Hartman Wed, 11 May 2005 00:10:44 -0700 committer Greg KH Mon, 16 May 2005 21:07:05 -0700 [PATCH] fix Linux kernel ELF core dump privilege elevation As reported by Paul Starzetz Reference: CAN-2005-1263 Signed-off-by: Greg Kroah-Hartman commit d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 tree 6e56e97c81b5b8c4d556ffd90349e73a885a20dc parent 8711a1b902e691c9b3bbd0d0624f836abe9641ca parent c8920ba041c8934b29370f5d62ab9ea8f147966b author Linus Torvalds Mon, 16 May 2005 20:06:47 -0700 committer Linus Torvalds Mon, 16 May 2005 20:06:47 -0700 Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git commit 8711a1b902e691c9b3bbd0d0624f836abe9641ca tree 588af68788e56f7e0e6132e52c35af4abcdb4c93 parent 768cbfbc5273bad91afe12b81471f563b288118a author Russell King Mon, 16 May 2005 23:36:22 +0100 committer Russell King Mon, 16 May 2005 23:36:22 +0100 [PATCH] ARM: Fix build error Mainline kernels don't have VECTORS_HIGH nor COPYPAGE_MINICACHE yet. Signed-off-by: Russell King commit 768cbfbc5273bad91afe12b81471f563b288118a tree 954b95e1d1af6c21df7c85f265d218e48908e161 parent 2a4a7e02e27b4f542473772d588f81759c209fb3 parent 05ab3014636ff60a319d37cdf37dca594b015eec author Linus Torvalds Mon, 16 May 2005 10:34:52 -0700 committer Linus Torvalds Mon, 16 May 2005 10:34:52 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git commit 2a4a7e02e27b4f542473772d588f81759c209fb3 tree 9b3f40337525c1bdec6b14936184c9794dcd2356 parent 85bcc13072c54592596c5b41d40d1c6a18b04e19 parent bfd4e0709fb977e64e27d9255be6e7aeadf4fcd4 author Linus Torvalds Mon, 16 May 2005 10:27:11 -0700 committer Linus Torvalds Mon, 16 May 2005 10:27:11 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git commit c8920ba041c8934b29370f5d62ab9ea8f147966b tree 6e0e12acd812f221906289348bc4e08cd1047df6 parent c4cc26d3310a6614a20e32276228a5d44159fc9b author Daniel Andersen Thu, 05 May 2005 15:14:09 -0700 committer Jeff Garzik Mon, 16 May 2005 00:04:29 -0400 [PATCH] wireless: 3CRWE154G72 Kconfig help fix Version 2 of the 3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 is not supported by the prism54 project. To stop confusion, the kernel documentation should state so as 3com made a good job hiding the version. Signed-off-by: Andrew Morton diff -puN drivers/net/wireless/Kconfig~wireless-3crwe154g72-kconfig-help-fix drivers/net/wireless/Kconfig commit c4cc26d3310a6614a20e32276228a5d44159fc9b tree 35246410bf048fb6a0aa455b272f2a2933dbacad parent 99718699f5746cc365f3a9ab4769568a1da97635 author Jiri Benc Wed, 27 Apr 2005 12:48:56 +0200 committer Jeff Garzik Sun, 15 May 2005 23:18:48 -0400 [PATCH] Typo in tulip driver This patch fixes a typo in tulip driver in 2.6.12-rc3. commit 99718699f5746cc365f3a9ab4769568a1da97635 tree 6f8f9ad590b14514ad88c3478328795148c91e46 parent f7a3aae1723e7ffc9c4fcdb489365da7a3d81255 author Geoff Levand Thu, 14 Apr 2005 11:20:32 -0700 committer Jeff Garzik Sun, 15 May 2005 22:44:26 -0400 [PATCH] {PATCH] Fix IBM EMAC driver ioctl bug Fix IBM EMAC driver ioctl bug. I found IBM EMAC driver bug. So mii-tool command print wrong status. # mii-tool eth0: 10 Mbit, half duplex, no link eth1: 10 Mbit, half duplex, no link I can get correct status on fixed kernel. # mii-tool eth0: negotiated 100baseTx-FD, link okZZ eth1: negotiated 100baseTx-FD, link ok Hiroaki Fuse Signed-off-by: Geoff Levand for CELF commit f7a3aae1723e7ffc9c4fcdb489365da7a3d81255 tree 2c0a93d730060f63670d3e7f130ee12e26b3ed8f parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Al Viro Sun, 03 Apr 2005 09:15:52 +0100 committer Jeff Garzik Sun, 15 May 2005 22:22:32 -0400 [PATCH] drivers/net/wireless enabled by wrong option NET_WIRELESS is only a subset of the stuff in drivers/net/wireless; NET_RADIO is what covers all of them. Signed-off-by: Al Viro commit bfd4e0709fb977e64e27d9255be6e7aeadf4fcd4 tree f5b1ec32cf9972f47a1f32419c3839c3e4695e28 parent 4ad3a443c9238c8df68f4519049c3c8d80fe62c2 author Ben Dooks Thu, 12 May 2005 19:27:14 +0100 committer Russell King Thu, 12 May 2005 19:27:14 +0100 [PATCH] ARM: 2678/1: S3C2440 - cpu fixes, hdiv divisors and nand dev name Patch from Ben Dooks Fix the setting of hdiv when set to divide-by-2. Thanks to Jeonghoon Yoon for pointing this out. Change name of the NAND device to "s3c2440-nand" as it is not similar enough to the "s3c2410-nand" device. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 9dabf9da18018b99a51334c2ef168019389ed5bf tree b89293a7d31464b0139c42ef0a84ded7f7c189ed parent 70489c88d0b7e5820ac37a039a910bb396e2a4e3 author Ben Dooks Thu, 12 May 2005 19:27:13 +0100 committer Russell King Thu, 12 May 2005 19:27:13 +0100 [PATCH] ARM: 2676/1: S3C2440 - NAND register additions Patch from Ben Dooks Add the register definitions for the s3c2440 NAND controller to the s3c2410 NAND register definitions Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4ad3a443c9238c8df68f4519049c3c8d80fe62c2 tree eb39723468aa2b9269cfb3440239315940ff69c8 parent 9dabf9da18018b99a51334c2ef168019389ed5bf author Ben Dooks Thu, 12 May 2005 19:27:13 +0100 committer Russell King Thu, 12 May 2005 19:27:13 +0100 [PATCH] ARM: 2677/1: S3C2440 - UPLL frequency doubled Patch from Ben Dooks S3C2440 UPLL is the same as the S3C2410 UPLL, it is only the MPLL which has an extra multiplication factor of 2 in the multiplier. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 70489c88d0b7e5820ac37a039a910bb396e2a4e3 tree 47f5ad9729469cad40c926af4961611208bdfdc1 parent d7def6c22dfa9f32b3d9e5546a7a6a90c644ff5f author Nicolas Pitre Thu, 12 May 2005 19:27:12 +0100 committer Russell King Thu, 12 May 2005 19:27:12 +0100 [PATCH] ARM: 2680/1: refine TLS reg availability some more again Patch from Nicolas Pitre Not all ARMv6 processors implement the TLS register. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d7def6c22dfa9f32b3d9e5546a7a6a90c644ff5f tree bae4cdc4e45905416e0868053d62b3dd4869c047 parent fa4354359f800ef9d68ed644438efd45b559b443 author Sascha Hauer Tue, 10 May 2005 19:01:35 +0100 committer Russell King Tue, 10 May 2005 19:01:35 +0100 [PATCH] ARM: 2666/1: i.MX pwm controller defines Patch from Sascha Hauer This patch adds the defines for the i.MX PWM controller Signed-off-by: Steven Scholz Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit fa4354359f800ef9d68ed644438efd45b559b443 tree 57b8fc85f04cb048ec03d01870c597de82f75535 parent 8d802d28c23122a57d7dddf4886b0486ca183d2d author Nicolas Pitre Tue, 10 May 2005 17:36:29 +0100 committer Russell King Tue, 10 May 2005 17:36:29 +0100 [PATCH] ARM: 2663/2: I can't type Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 8d802d28c23122a57d7dddf4886b0486ca183d2d tree f4727bdf06706deffe9516a531275c6aa63d9dba parent 08ee4e4c5fd3fb0857eeb6a5a0ff66881432e8a3 author Russell King Tue, 10 May 2005 17:31:43 +0100 committer Russell King Tue, 10 May 2005 17:31:43 +0100 [PATCH] ARM: Add V6 aliasing cache flush Add cache flushing support for aliased V6 caches to flush_dcache_page. Signed-off-by: Russell King commit 08ee4e4c5fd3fb0857eeb6a5a0ff66881432e8a3 tree a4c70b10a7bbd4dd5606a5d5122d98fd2c82b229 parent d2bab05ac1f9a2f5ddcd2f3256237e5c47fc127f author Russell King Tue, 10 May 2005 17:30:47 +0100 committer Russell King Tue, 10 May 2005 17:30:47 +0100 [PATCH] ARM: Use top_pmd for V6 copy/clear user_page Remove needless page table walking for v6 page operations. Signed-off-by: Russell King commit d2bab05ac1f9a2f5ddcd2f3256237e5c47fc127f tree a330a8ac155d82bae9a500d28533888dedad4d1e parent c4e1f6f6bf82af89994a0ee760fc5e036c4d3c1f author Russell King Tue, 10 May 2005 14:23:01 +0100 committer Russell King Tue, 10 May 2005 14:23:01 +0100 [PATCH] ARM: Move copy/clear user_page locking into implementation Move the locking for copy_user_page() and clear_user_page() into the implementations which require locking. For simple memcpy/ memset based implementations, the locking is extra overhead which is not necessary, and prevents preemption occuring. Signed-off-by: Russell King commit c4e1f6f6bf82af89994a0ee760fc5e036c4d3c1f tree 64d5168e48eb879cb7452e80b06b7d7eaa6a709c parent 155bb14482cc567761c13b4efc064de400c55e18 author Russell King Tue, 10 May 2005 10:40:19 +0100 committer Russell King Tue, 10 May 2005 10:40:19 +0100 [PATCH] ARM: Add top_pmd, which points at the top-most page table Signed-off-by: Russell King commit 05ab3014636ff60a319d37cdf37dca594b015eec tree d9d948a5ecd5e10cd511ebca328df2ef08d5e076 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Russell King Mon, 09 May 2005 23:21:59 +0100 committer Russell King Mon, 09 May 2005 23:21:59 +0100 [PATCH] Serial: Add uart_insert_char() Add uart_insert_char(), which handles inserting characters into the flip buffer. This helper function handles the correct semantics for handling overrun in addition to inserting normal characters. Signed-off-by: Russell King commit 155bb14482cc567761c13b4efc064de400c55e18 tree 28c9e8989febe619383ceba4b4115ebaafd847bf parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Russell King Mon, 09 May 2005 20:52:51 +0100 committer Russell King Mon, 09 May 2005 20:52:51 +0100 [PATCH] ARM: Add inline functions to find the pmd from virtual address Add pmd_off() and pmd_off_k() to obtain the pmd pointer for a virtual address, and use them throughout the mm initialisation. Signed-off-by: Russell King commit 85bcc13072c54592596c5b41d40d1c6a18b04e19 tree 1f3fe7a88f37ed72f6cdaf6117f0299caf4ab59a parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Pierre Ossman Sun, 08 May 2005 19:35:27 +0100 committer Russell King Sun, 08 May 2005 19:35:27 +0100 [PATCH] MMC: wbsd update Updates to the wbsd driver. * Fix to handle DAT3 card detection. * Fixed bug which could cause large writes to stall in FIFO mode. * Plug 'n Play support. In most cases you need ACPI PNP for this to work. * Uses generic DMA API (ISA dependency removed).