commit ba9e358fd04190a59e605c2963a15e014139a707 tree 05b4baf382124a9a0342777127c09832dcbd88c0 parent 75eeec2f3fd9e8a16777219ebf1bf8395845faa7 parent 055787e447a6cf50aa1cc42f7d3b07f08223dd9b author Linus Torvalds Sun, 23 Oct 2005 17:13:14 -0700 committer Linus Torvalds Sun, 23 Oct 2005 17:13:14 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 commit 75eeec2f3fd9e8a16777219ebf1bf8395845faa7 tree 347883a070001786aafdbf284d8d6971ab44dbff parent 8d3b35914aa54232b27e6a2b57d84092aadc5e86 author Roland Dreier Sun, 23 Oct 2005 12:57:19 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:39 -0700 [PATCH] ib: mthca: Always re-arm EQs in mthca_tavor_interrupt() We should always re-arm an event queue's interrupt in mthca_tavor_interrupt() if the corresponding bit is set in the event cause register (ECR), even if we didn't find any entries in the EQ. If we don't, then there's a window where we miss an EQ entry and then get stuck because we don't get another EQ event. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d3b35914aa54232b27e6a2b57d84092aadc5e86 tree 809be8fad6743a751964677e68c5c01af3198e4b parent c0fef676bbd75e711711ed3ff5bebb7bfd1bdb00 author Andrew Morton Sun, 23 Oct 2005 12:57:18 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:39 -0700 [PATCH] inotify/idr leak fix Fix a bug which was reported and diagnosed by Stefan Jones IDR trees include a cache of idr_layer objects. There's no way to destroy this cache, so when we discard an overall idr tree we end up leaking some memory. Add and use idr_destroy() for this. v9fs and infiniband also need to use idr_destroy() to avoid leaks. Or, we make the cache global, like radix_tree_preload(). Which is probably better. Later. Cc: Eric Van Hensbergen Cc: Roland Dreier Cc: Robert Love Cc: John McCutchan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0fef676bbd75e711711ed3ff5bebb7bfd1bdb00 tree 00b64d3cb25ff7bd9c30b5ca763158a6c2e88666 parent 20c19e4179884d7e843314071e2dfb1ea7b0afcd author Mike Krufky Sun, 23 Oct 2005 12:57:17 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:39 -0700 [PATCH] Kconfig: saa7134-dvb should not select cx22702 On 2005-05-01, Gerd Knorr sent in a patch to add cx22702 to cx88-dvb: [PATCH] dvb: cx22702 frontend driver update http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9990d744bea7d28e83c420e2c9d524c7a8a2d136 ...but as we can see, the Kconfig portion of his patch was incorrectly applied to saa7134-dvb instead of cx88-dvb. On 2005-06-24, Adrian bunk fixed cx88-dvb: [PATCH] VIDEO_CX88_DVB must select DVB_CX22702 http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d6988588e13616587aa879c2e0bd7cd811705e5d ...but we never removed the original patch from Gerd. This patch sets things straight: saa7134-dvb should not select cx22702 Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20c19e4179884d7e843314071e2dfb1ea7b0afcd tree 1ed0cc19c51b10336c14a1b9c35095ef8ebfd138 parent 282c1f5eba150d0b156ffa9e6b064f1d92f8315f author Davi Arnaut Sun, 23 Oct 2005 12:57:16 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:39 -0700 [PATCH] SELinux: handle sel_make_bools() failure in selinuxfs This patch fixes error handling in sel_make_bools(), where currently we'd get a memory leak via security_get_bools() and try to kfree() the wrong pointer if called again. Signed-off-by: James Morris Acked-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 282c1f5eba150d0b156ffa9e6b064f1d92f8315f tree 1b4446dc0a2651a340be0c0485c8e053cdb27407 parent 8766ce41018a0cb80fbe0ce7dbf747f357c752da author Stephen Smalley Sun, 23 Oct 2005 12:57:15 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:38 -0700 [PATCH] selinux: Fix NULL deref in policydb_destroy This patch fixes a possible NULL dereference in policydb_destroy, where p->type_attr_map can be NULL if policydb_destroy is called to clean up a partially loaded policy upon an error during policy load. Please apply. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8766ce41018a0cb80fbe0ce7dbf747f357c752da tree 68daf47f292ef79987f208db8f4d2dabfec7fb57 parent a991304496bdaec09f497d1eb5d9dcf2f94b7d5d author Kostik Belousov Sun, 23 Oct 2005 12:57:13 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:38 -0700 [PATCH] aio syscalls are not checked by lsm Another case of missing call to security_file_permission: aio functions (namely, io_submit) does not check credentials with security modules. Below is the simple patch to the problem. It seems that it is enough to check for rights at the request submission time. Signed-off-by: Kostik Belousov Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a991304496bdaec09f497d1eb5d9dcf2f94b7d5d tree b054943b057ce75e9bfcd89d3a441793aa46d0b0 parent 4196c3af25d98204216a5d6c37ad2cb303a1f2bf author Randy Dunlap Sun, 23 Oct 2005 12:57:11 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:38:38 -0700 [PATCH] kernel-parameters cleanup Fix typos & trailing whitespace. Add blank lines in a few places. Remove "AM53C974=" option: driver does not exist. Restrict to < 80 columns in most places (but don't split formatted command-line arguments). Add a few option arguments for completeness. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4196c3af25d98204216a5d6c37ad2cb303a1f2bf tree ac636ec99466e67eaa1b52555517a48a1c4fcb35 parent 9092b20803e4b3b3a480592794a73030f17370b3 author Linus Torvalds Sun, 23 Oct 2005 16:31:16 -0700 committer Linus Torvalds Sun, 23 Oct 2005 16:31:16 -0700 cardbus: limit IO windows to 256 bytes That's what we've always historically done, and bigger windows seem to confuse some cardbus bridges. Or something. Alan reports that this makes the ThinkPad 600x series work properly again: the 4kB IO window for some reason made IDE DMA not work, which makes IDE painfully slow even if it works after DMA timeouts. Signed-off-by: Linus Torvalds commit 9092b20803e4b3b3a480592794a73030f17370b3 tree 35389468ae228dc5efe945dc370a0c75f74290bd parent e80eda94d3eaf1d12cfc97878eff77cd679dabc9 parent 49636bb12892786e4a7b207b37ca7b0c5ca1cae0 author Linus Torvalds Sun, 23 Oct 2005 10:10:37 -0700 committer Linus Torvalds Sun, 23 Oct 2005 10:10:37 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 commit e80eda94d3eaf1d12cfc97878eff77cd679dabc9 tree 38ab17e7b9839297708a6982d661c3725d181c3a parent d475f3f47a0427dfee483cecf9a7e9109e991423 author Linus Torvalds Sun, 23 Oct 2005 10:02:50 -0700 committer Linus Torvalds Sun, 23 Oct 2005 10:02:50 -0700 Posix timers: limit number of timers firing at once Bursty timers aren't good for anybody, very much including latency for other programs when we trigger lots of timers in interrupt context. So set a random limit, after which we'll handle the rest on the next timer tick. Noted by Oleg Nesterov Signed-off-by: Linus Torvalds commit 49636bb12892786e4a7b207b37ca7b0c5ca1cae0 tree b7a29d9344d0e6ee41d5e28f5a7b6fda5da05fa3 parent 6fb9974f49f7a6032118c5b6caa6e08e7097913e author Herbert Xu Sun, 23 Oct 2005 17:18:00 +1000 committer Herbert Xu Sun, 23 Oct 2005 17:18:00 +1000 [NEIGH] Fix timer leak in neigh_changeaddr neigh_changeaddr attempts to delete neighbour timers without setting nud_state. This doesn't work because the timer may have already fired when we acquire the write lock in neigh_changeaddr. The result is that the timer may keep firing for quite a while until the entry reaches NEIGH_FAILED. It should be setting the nud_state straight away so that if the timer has already fired it can simply exit once we relinquish the lock. In fact, this whole function is simply duplicating the logic in neigh_ifdown which in turn is already doing the right thing when it comes to deleting timers and setting nud_state. So all we have to do is take that code out and put it into a common function and make both neigh_changeaddr and neigh_ifdown call it. Signed-off-by: Herbert Xu commit 6fb9974f49f7a6032118c5b6caa6e08e7097913e tree a1e8f77c1c5cd6a45842f4f02582bb583e6d1019 parent 203755029e063066ecc4cf5eee1110ab946c2d88 author Herbert Xu Sun, 23 Oct 2005 16:37:48 +1000 committer Herbert Xu Sun, 23 Oct 2005 16:37:48 +1000 [NEIGH] Fix add_timer race in neigh_add_timer neigh_add_timer cannot use add_timer unconditionally. The reason is that by the time it has obtained the write lock someone else (e.g., neigh_update) could have already added a new timer. So it should only use mod_timer and deal with its return value accordingly. This bug would have led to rare neighbour cache entry leaks. Signed-off-by: Herbert Xu commit 203755029e063066ecc4cf5eee1110ab946c2d88 tree 2f57df251c75847c7fe6e5c694319553733812b9 parent d475f3f47a0427dfee483cecf9a7e9109e991423 author Herbert Xu Sun, 23 Oct 2005 16:11:39 +1000 committer Herbert Xu Sun, 23 Oct 2005 16:11:39 +1000 [NEIGH] Print stack trace in neigh_add_timer Stack traces are very helpful in determining the exact nature of a bug. So let's print a stack trace when the timer is added twice. Signed-off-by: Herbert Xu commit d475f3f47a0427dfee483cecf9a7e9109e991423 tree bbaa882b849acf13e624e3e1d8f4d31280a4b74b parent 4595f251058609d97a5d792de08c34a7956af816 author Ivan Kokshaysky Fri, 21 Oct 2005 22:06:15 +0400 committer Linus Torvalds Sat, 22 Oct 2005 19:38:33 -0700 [PATCH] alpha: additional smp barriers As stated in Documentation/atomic_ops.txt, atomic functions returning values must have the memory barriers both before and after the operation. Thanks to DaveM for pointing that out. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 4595f251058609d97a5d792de08c34a7956af816 tree 3742b9fa7befc487d2bddf41fa7a1ea686b7f72d parent c98d80edc827277c28f88d662a7d6e9affa7e12f author Ralf Baechle Fri, 14 Oct 2005 21:29:56 +0100 committer Arnaldo Carvalho de Melo Sat, 22 Oct 2005 17:20:50 -0200 [AX.25]: Fix signed char bug On architectures where the char type defaults to unsigned some of the arithmetic in the AX.25 stack to fail, resulting in some packets being dropped on receive. Credits for tracking this down and the original patch to Bob Brose N0QBJ . Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Arnaldo Carvalho de Melo commit c98d80edc827277c28f88d662a7d6e9affa7e12f tree f5371836f011c1ee135edcef7de5f365fce535fc parent 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f author Julian Anastasov Sat, 22 Oct 2005 13:39:21 +0300 committer Arnaldo Carvalho de Melo Sat, 22 Oct 2005 17:06:01 -0200 [SK_BUFF]: ipvs_property field must be copied IPVS used flag NFC_IPVS_PROPERTY in nfcache but as now nfcache was removed the new flag 'ipvs_property' still needs to be copied. This patch should be included in 2.6.14. Further comments from Harald Welte: Sorry, seems like the bug was introduced by me. Signed-off-by: Julian Anastasov Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo commit 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f tree 038e1fd143ea3e9957c6dcae16dd391decfde011 parent 25f407f0b668f5e4ebd5d13e1fb4306ba6427ead author Chris Wright Fri, 21 Oct 2005 16:56:08 -0700 committer Linus Torvalds Fri, 21 Oct 2005 17:08:30 -0700 [PATCH] typo fix in last cpufreq powernow patch Not sure how it slipped by, but here's a trivial typo fix for powernow. Signed-off-by: Chris Wright [ It's "nurter" backwards.. Maybe we have a hillbilly The Shining fan? ] Signed-off-by: Linus Torvalds commit 25f407f0b668f5e4ebd5d13e1fb4306ba6427ead tree 10d8661419da9e0d6be6d22ef319582d052c4a26 parent 9465bee863bc4c6cf1566c12d6f92a8133e3da5c author Roland McGrath Fri, 21 Oct 2005 15:03:29 -0700 committer Linus Torvalds Fri, 21 Oct 2005 15:38:08 -0700 [PATCH] Call exit_itimers from do_exit, not __exit_signal When I originally moved exit_itimers into __exit_signal, that was the only place where we could reliably know it was the last thread in the group dying, without races. Since then we've gotten the signal_struct.live counter, and do_exit can reliably do group-wide cleanup work. This patch moves the call to do_exit, where it's made without locks. This avoids the deadlock issues that the old __exit_signal code's comment talks about, and the one that Oleg found recently with process CPU timers. [ This replaces e03d13e985d48ac4885382c9e3b1510c78bd047f, which is why it was just reverted. ] Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 9465bee863bc4c6cf1566c12d6f92a8133e3da5c tree 339f5d3f7554afe2226eb6bdf9fa63851ae73311 parent 0213df74315bbab9ccaa73146f3e11972ea6de46 author Linus Torvalds Fri, 21 Oct 2005 15:36:00 -0700 committer Linus Torvalds Fri, 21 Oct 2005 15:36:00 -0700 Revert "Fix cpu timers exit deadlock and races" Revert commit e03d13e985d48ac4885382c9e3b1510c78bd047f, to be replaced by a much nicer fix from Roland. commit 0213df74315bbab9ccaa73146f3e11972ea6de46 tree 68a71915bb58a18168cd13744772bd447bcf8b29 parent 3078fcc1d18c7235b034dc889642c5300959fa20 author Dave Jones Fri, 21 Oct 2005 17:21:03 -0400 committer Linus Torvalds Fri, 21 Oct 2005 14:28:58 -0700 [PATCH] cpufreq: fix pending powernow timer stuck condition AMD recently discovered that on some hardware, there is a race condition possible when a C-state change request goes onto the bus at the same time as a P-state change request. Both requests happen, but the southbridge hardware only acknowledges the C-state change. The PowerNow! driver is then stuck in a loop, waiting for the P-state change acknowledgement. The driver eventually times out, but can no longer perform P-state changes. It turns out the solution is to resend the P-state change, which the southbridge will acknowledge normally. Thanks to Johannes Winkelmann for reporting this and testing the fix. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 3078fcc1d18c7235b034dc889642c5300959fa20 tree 7d4a495e007a8edc59901fc40aaeeec448fd5883 parent 2c86c83bf4e7fa1ef0d625e297607dc5d0d94dd4 author David Gibson Fri, 21 Oct 2005 13:41:19 +1000 committer Linus Torvalds Fri, 21 Oct 2005 12:24:41 -0700 [PATCH] ppc64: Fix typo bug in iSeries hash code This fixes a stupid typo bug in the iSeries hash table code. When we place a hash PTE in the secondary bucket, instead of setting the SECONDARY flag bit, as we should, we (redundantly) set the VALID flag. This was introduced with the patch abolishing bitfields from the hash table code. Mea culpa, oops. It hasn't been noticed until now because in practice we don't hit the secondary bucket terribly often. Signed-off-by: David Gibson Signed-off-by: Linus Torvalds commit 2c86c83bf4e7fa1ef0d625e297607dc5d0d94dd4 tree fe1fca67f5cac43036bc7ee75283807446c634c9 parent cffc7b38a23960d5f83b0aec5e67f189a6ae8062 parent d18566376055046fca0b51ad536f1778ef34966a author Linus Torvalds Fri, 21 Oct 2005 12:23:07 -0700 committer Linus Torvalds Fri, 21 Oct 2005 12:23:07 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit cffc7b38a23960d5f83b0aec5e67f189a6ae8062 tree 2d3d5f6bd4447a482d4fcf51a788e2fc4c34c20d parent e29971f9a4ca08c3c31b98be96c293ef9f7dcc32 parent b2cc99f04c5a732c793519aca61a20f719b50db4 author Linus Torvalds Fri, 21 Oct 2005 12:22:33 -0700 committer Linus Torvalds Fri, 21 Oct 2005 12:22:33 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 commit e29971f9a4ca08c3c31b98be96c293ef9f7dcc32 tree 9542decf5a838b36bee07fd5961e059d328da128 parent 5d96551541a8f5521dcc8c634a18d42a3d349ec9 author Dave Airlie Thu, 20 Oct 2005 23:49:00 +0100 committer Linus Torvalds Fri, 21 Oct 2005 12:18:09 -0700 [PATCH] drm: another mga bug The wrong state emission routines were being called for G550, and consistent maps weren't correctly mapped... Signed-off-by: Dave Airlie Signed-off-by: Linus Torvalds commit 5d96551541a8f5521dcc8c634a18d42a3d349ec9 tree 6aad2e082c3e57f00024f86287444a8ded086933 parent a1c7e111934b6375baf07a970d6c890d18d7e34f author Benjamin Herrenschmidt Fri, 21 Oct 2005 14:12:51 +1000 committer Linus Torvalds Fri, 21 Oct 2005 12:17:43 -0700 [PATCH] ppc64: Fix pages marked dirty abusively While working on 64K pages, I found this little buglet in our update_mmu_cache() implementation. The code calls __hash_page() passing it an "access" parameter (the type of access that triggers the hash) containing the bits _PAGE_RW and _PAGE_USER of the linux PTE. The latter is useless in this case and the former is wrong. In fact, if we have a writeable PTE and we pass _PAGE_RW to hash_page(), it will set _PAGE_DIRTY (since we track dirty that way, by hash faulting !dirty) which is not what we want. In fact, the correct fix is to always pass 0. That means that only read-only or already dirty read write PTEs will be preloaded. The (hopefully rare) case of a non dirty read write PTE can't be preloaded this way, it will have to fault in hash_page on the actual access. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit a1c7e111934b6375baf07a970d6c890d18d7e34f tree 8a6c05fbf5917b82866059bf8d2ff5db0103f5bd parent 024358eeafd44ecffd0e7a1002ef3ccc1d0acd4d author Paul Mackerras Fri, 21 Oct 2005 22:39:36 +1000 committer Linus Torvalds Fri, 21 Oct 2005 12:17:43 -0700 [PATCH] ppc64: Fix typo in time calculations This fixes a typo in the div128_by_32 function used in the timekeeping calculations on ppc64. If you look at the code it's quite obvious that we need (rb + c) rather than (rb + b). The "b" is clearly just a typo. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 024358eeafd44ecffd0e7a1002ef3ccc1d0acd4d tree a0ff602027b59745c01d69976f3c00e9c9fc47bb parent ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 author Eric Moore Fri, 21 Oct 2005 20:56:36 +0200 committer Linus Torvalds Fri, 21 Oct 2005 12:17:43 -0700 [PATCH] mptsas: fix phy identifiers This fixes handling of the phy identifiers in mptsas. Signed-off-by: Eric Moore [ split it a pre-2.6.14 portion from Eric's bigger patch ] Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit d18566376055046fca0b51ad536f1778ef34966a tree e613d875248d2dcd585e3c5b361562799e3fadca parent 7fe8785e4198ad6b5dfd4a76c44c97e9b4463534 author Russell King Fri, 21 Oct 2005 10:17:37 +0100 committer Russell King Fri, 21 Oct 2005 10:17:37 +0100 [ARM] Fix Integrator IM/PD-1 support Signed-off-by: Russell King commit 7fe8785e4198ad6b5dfd4a76c44c97e9b4463534 tree 72b3df4ec83116fad9546c41f0ef549dad52236b parent b048dbf4d428c89f219efc2eddf2771f13500503 author Ben Dooks Thu, 20 Oct 2005 23:21:20 +0100 committer Russell King Thu, 20 Oct 2005 23:21:20 +0100 [ARM] 3028/1: S3C2410 - add DCLK mask definitions Patch from Ben Dooks From: Guillaume Gourat Add MASK definitions for DCLK0 and DCLK1 Signed-off-by: Guillaume Gourat Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b048dbf4d428c89f219efc2eddf2771f13500503 tree 4aadcb79d1f70b14ee1c411501fc8f7345e6e4da parent a7ce8edc8232da51dc3a804ec9c734019d115b40 author Ben Dooks Thu, 20 Oct 2005 23:21:19 +0100 committer Russell King Thu, 20 Oct 2005 23:21:19 +0100 [ARM] 3027/1: BAST - reduce NAND timings slightly Patch from Ben Dooks The current Simtec BAST nand area timings are a little too slow to be obtained by a 2410 running at 266MHz, so reduce the timings slightly to bring them into the acceptable range. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a7ce8edc8232da51dc3a804ec9c734019d115b40 tree 05d79d60b96b59d62709b11c2b1c1b497cb70902 parent b2640b420a806c91f6b8799314ca96bb88a246d2 author Ben Dooks Thu, 20 Oct 2005 23:21:18 +0100 committer Russell King Thu, 20 Oct 2005 23:21:18 +0100 [ARM] 3026/1: S3C2410 - avoid possible overflow in pll calculations Patch from Ben Dooks Avoid the possiblity that if the board is using a 16.9334 or higher crystal with a high PLL multiplier, then the pll value could overflow the capability of an int. Also fix the value types of the intermediate variables to unsigned int. Rewrite of patch from Guillaume Gourat Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b2640b420a806c91f6b8799314ca96bb88a246d2 tree a80d5105162a0c29b77f8fd84d05801597497d20 parent 93918e9afc76717176e9e114e79cdbb602a45ae8 author Matt Reimer Thu, 20 Oct 2005 23:21:18 +0100 committer Russell King Thu, 20 Oct 2005 23:21:18 +0100 [ARM] 3025/1: Add I2S platform device for PXA Patch from Matt Reimer Adds an I2S platform_device for PXA. I2S is used to interface with sound chips on systems like iPAQ h1910/h2200/hx4700 and Asus 716. Signed-off-by: mreimer@vpop.net Signed-off-by: Russell King commit b2cc99f04c5a732c793519aca61a20f719b50db4 tree 0614c2c1d40926cec4bfe91524bf50c6aff0063f parent 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5 author Herbert Xu Thu, 20 Oct 2005 17:13:13 -0200 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 17:13:13 -0200 [TCP] Allow len == skb->len in tcp_fragment It is legitimate to call tcp_fragment with len == skb->len since that is done for FIN packets and the FIN flag counts as one byte. So we should only check for the len > skb->len case. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5 tree dbd4565b42697a7fdeee8d088f017eb7df8bc594 parent ffa29347dfbc158d1f47f5925324a6f5713659c1 author Herbert Xu Tue, 18 Oct 2005 12:03:28 +1000 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 14:49:59 -0200 [DCCP]: Clear the IPCB area Turns out the problem has nothing to do with use-after-free or double-free. It's just that we're not clearing the CB area and DCCP unlike TCP uses a CB format that's incompatible with IP. Signed-off-by: Herbert Xu Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit ffa29347dfbc158d1f47f5925324a6f5713659c1 tree 66c0360d21cc842af830b9c7ffd6e924652e7ce3 parent fda0fd6c5b722cc48e904e0daafedca275d332af author Herbert Xu Sun, 16 Oct 2005 21:08:46 +1000 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 14:44:29 -0200 [DCCP]: Make dccp_write_xmit always free the packet icmp_send doesn't use skb->sk at all so even if skb->sk has already been freed it can't cause crash there (it would've crashed somewhere else first, e.g., ip_queue_xmit). I found a double-free on an skb that could explain this though. dccp_sendmsg and dccp_write_xmit are a little confused as to what should free the packet when something goes wrong. Sometimes they both go for the ball and end up in each other's way. This patch makes dccp_write_xmit always free the packet no matter what. This makes sense since dccp_transmit_skb which in turn comes from the fact that ip_queue_xmit always frees the packet. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit fda0fd6c5b722cc48e904e0daafedca275d332af tree a575ee8872964b55a8ef64ed9f57f52f26e25979 parent ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 author Herbert Xu Fri, 14 Oct 2005 16:38:49 +1000 committer Arnaldo Carvalho de Melo Thu, 20 Oct 2005 14:25:28 -0200 [DCCP]: Use skb_set_owner_w in dccp_transmit_skb when skb->sk is NULL David S. Miller wrote: > One thing you can probably do for this bug is to mark data packets > explicitly somehow, perhaps in the SKB control block DCCP already > uses for other data. Put some boolean in there, set it true for > data packets. Then change the test in dccp_transmit_skb() as > appropriate to test the boolean flag instead of "skb_cloned(skb)". I agree. In fact we already have that flag, it's called skb->sk. So here is patch to test that instead of skb_cloned(). Signed-off-by: Herbert Xu Acked-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 tree 3903d87d0b56a49ead39c0460b5bc0b86b040775 parent 93918e9afc76717176e9e114e79cdbb602a45ae8 author Hugh Dickins Thu, 20 Oct 2005 16:24:28 +0100 committer Linus Torvalds Thu, 20 Oct 2005 09:02:07 -0700 [PATCH] Fix handling spurious page fault for hugetlb region This reverts commit 3359b54c8c07338f3a863d1109b42eebccdcf379 and replaces it with a cleaner version that is purely based on page table operations, so that the synchronization between inode size and hugetlb mappings becomes moot. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 055787e447a6cf50aa1cc42f7d3b07f08223dd9b tree b78da02d3a3cb346b54f224474d490f72f77f1a1 parent 16192896ea8e03d18d4228023500607b00df49e6 author Steven Rostedt Wed, 19 Oct 2005 08:22:13 -0400 committer James Bottomley Wed, 19 Oct 2005 09:53:59 -0400 [SCSI] scsi_error thread exits in TASK_INTERRUPTIBLE state. Found in the -rt patch set. The scsi_error thread likely will be in the TASK_INTERRUPTIBLE state upon exit. This patch fixes this bug. Signed-off-by: Steven Rostedt Signed-off-by: James Bottomley commit 16192896ea8e03d18d4228023500607b00df49e6 tree 091a6ef94a16bce2c2badbcc782644bdc227869a parent f4fd20bf31376f29e4edde6596e3972198877309 author Christoph Hellwig Mon, 17 Oct 2005 15:40:52 +0200 committer James Bottomley Mon, 17 Oct 2005 12:27:58 -0400 [SCSI] mptsas: fix phy identifiers This patch from Eric fixes handling of the phy identifiers in mptsas. I've split it up from his bigger patch as it should go into 2.6.14 still. Signed-off-by: Eric Moore Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit f4fd20bf31376f29e4edde6596e3972198877309 tree fb9b331b7cd2e2a98e81554876945f796d3e2b61 parent 7c72ce81870ded9365f4bc5caa98ef1591dd18dd author Karl Magnus Kolstoe Mon, 17 Oct 2005 10:05:42 +0200 committer James Bottomley Mon, 17 Oct 2005 12:24:04 -0400 [SCSI] 2.6.13.3; add Pioneer DRM-624x to drivers/scsi/scsi_devinfo.c The patch below should make the Pioneer DRM-624X automatically be set up with all 6 "drives". (6 slot SCSI CD changer) Signed-off-by: Karl Magnus Kolstø Signed-off-by: James Bottomley commit 7c72ce81870ded9365f4bc5caa98ef1591dd18dd tree ff1eae57d11693f7e2d36efd3fdc26efa45e1419 parent d16794f6ac8d9b50f62e02a6e6175ae1a30d0ccd author Alan Stern Fri, 14 Oct 2005 11:23:27 -0400 committer James Bottomley Sun, 16 Oct 2005 15:35:11 -0500 [SCSI] Fix leak of Scsi_Cmnds When a request is deferred in scsi_init_io because the sg table could not be allocated, the associated scsi_cmnd is not released and the request is not marked with REQ_DONTPREP. When the command is retried, if scsi_prep_fn decides to kill it then the scsi_cmnd will never be released. This patch (as573) changes scsi_init_io so that it calls scsi_put_command before deferring a request. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit d16794f6ac8d9b50f62e02a6e6175ae1a30d0ccd tree b97195955b9527fe20eda91c0249df653a6d1242 parent 7a9366e46c167930f8bd9e378a3656861c5a41b6 author James.Smart@Emulex.Com Wed, 05 Oct 2005 13:50:08 -0400 committer James Bottomley Sun, 16 Oct 2005 12:04:22 -0500 [SCSI] FW: [PATCH] for Deadlock in transport_fc Cannot call fc_rport_terminate() under the host lock, so drop the lock. Signed-off-by: James Bottomley commit 7a9366e46c167930f8bd9e378a3656861c5a41b6 tree 294a2cd53359a436e2df9991b29d875358275420 parent f566a576bca09de85bf477fc0ab2c8c96405b77b author Salyzyn, Mark Wed, 05 Oct 2005 12:58:38 -0400 committer James Bottomley Sun, 16 Oct 2005 12:00:36 -0500 [SCSI] Fix aacraid regression Juan was kind enough to linger on site, and work on a production machine, to try the parameter to make the system stable. He discovered that reducing the maximum transfer size issued to the adapter to 128KB stabilized his system. This is related to an earlier change for the 2.6.13 tree resulting from Martin Drab's testing where the transfer size was reduced from 4G to 256KB; we needed to go still further in scaling back the request size. Here is the patch that tames this regression. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit f566a576bca09de85bf477fc0ab2c8c96405b77b tree ed4ae0c7a3592841367d486e867e43c82a83a5da parent 7a3ca7d2b5ec31b2cfa594b961d77e68075e33c7 author Randy Dunlap Sun, 02 Oct 2005 17:15:29 -0700 committer James Bottomley Sun, 16 Oct 2005 11:50:21 -0500 [SCSI] NCR5380: fix undefined preprocessor identifier Fix 12 undefined preprocessor identifier warnings (4 each in 3 driver builds): drivers/scsi/NCR5380.c:2744:16: warning: undefined preprocessor identifier 'NDEBUG_ABORT' drivers/scsi/NCR5380.c:2744:16: warning: "NDEBUG_ABORT" is not defined Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley