1. OpenVZ-legacy


AuthorCommitMessageCommit dateIssues
Pavel EmelyanovPavel Emelyanov
f3d52fc5575OpenVZ kernel 2.6.32-dzhanibekov releasedNamed after Vladimir Aleksandrovich Dzhanibekov - a soviet cosmonaut Signed-off-by: Pavel Emelyanov <>
Pavel EmelyanovPavel Emelyanov
877ea29bb75slab: Compilation fix for !SLABINFO case Signed-off-by: Pavel Emelyanov <>
Pavel EmelyanovPavel Emelyanov
8491289d858vzdq: Compilation fix for no-ugid-quota case Signed-off-by: Pavel Emelyanov <>
Cyrill GorcunovCyrill Gorcunov
e924167368dRestore PPP virtualizationppp: Restore virtualization During migration to 2.6.32 we've lost some virtualization features in PPP facility. Get it back. Signed-off-by: Cyrill Gorcunov <> Signed-off-by: Pavel Emelyanov <>
Ben HutchingsBen Hutchings
62c8dc47f9fprintk: Handle global log buffer reallocationCurrently an increase in log_buf_len results in disaster, as ve0.log_buf is left pointing to the old log buffer. Update ve0.log_buf when the global log buffer is reallocated. Also acquire logbuf_lock before reading ve_log_buf_len, to avoid a race with reallocation. Reported-and-tested-by: Tim Small <> Signed-off-by: Ben Hutchings <> Signed-off-by: maximilian...
Cyrill GorcunovCyrill Gorcunov
6f60f358acenet, sysfs: Allow to move netdevice sysfs links between namespacesThe kernel already tuned for this no need to check for init_net Signed-off-by: Cyrill Gorcunov <> Signed-off-by: Pavel Emelyanov <>
Andrey VaginAndrey Vagin
36257fa14f5net: use correct skb for GSO caseGSO code use the variable nskb Signed-off-by: Andrey Vagin <> Signed-off-by: Pavel Emelyanov <>
Andrey VaginAndrey Vagin
12b9937d06anet: release dst entry while cache-hot for GSO case tooNon-GSO code drops dst entry for performance reasons, but the same is missing for GSO code. Drop dst while cache-hot for GSO case too. this patch has been backported from mainstream because of Signed-off-by: Krishna Kumar <> Acked-by: Eric Dumazet <> Signed-off-by: David S. Miller <> Si...
Konstantin KhlebnikovKonstantin Khlebnikov
6909d4328e3cfq-iosched: do not force idling for sync workloadrevert v2.6.32-108-gc04645e blkio: Wait on sync-noidle queue even if rq_noidle = 1 by Vivek Goyal <> and piece of v2.6.32-rc5-486-g8e55063 cfq-iosched: fix corner cases in idling logic by Corrado Zoccolo <> fix perfomance degradation for massive write-fsync pattern: # sysbench --test=fileio --file-num=1 --file-total-size=1G --file-fsync-all=on \ --file-test-...
Pavel EmelyanovPavel Emelyanov
01cd32b7577MMerged linux- Makefile net/ipv4/tcp.c net/ipv4/tcp_timer.c I had to rewrite the per-bc orphan management due to a89d316f (tcp: Combat per-cpu skew in orphan tests). Signed-off-by: Pavel Emelyanov <>
Greg Kroah-HartmanGreg Kroah-Hartman
Stefan BaderStefan Bader
78b8fca43dcmm: Move vma_stack_continue into mm.hcommit 39aa3cb3e8250db9188a6f1e3fb62ffa1a717678 upstream. So it can be used by all that need to check for that. Signed-off-by: Stefan Bader <> Signed-off-by: Linus Torvalds <> Signed-off-by: Greg Kroah-Hartman <>
Rémi Denis-CourmontRémi Denis-Courmont
8e983dfe01dPhonet: disable network namespace support[Solved differently upstream] Network namespace in the Phonet socket stack causes an OOPS when a namespace is destroyed. This occurs as the loopback exit_net handler is called after the Phonet exit_net handler, and re-enters the Phonet stack. I cannot think of any nice way to fix this in kernel <= 2.6.32. For lack of a better solution, disable namespace support completely. If you need that, u...
Roland McGrathRoland McGrath
b9d023fbff9execve: make responsive to SIGKILL with large argumentscommit 9aea5a65aa7a1af9a4236dfaeb0088f1624f9919 upstream. An execve with a very large total of argument/environment strings can take a really long time in the execve system call. It runs uninterruptibly to count and copy all the strings. This change makes it abort the exec quickly if sent a SIGKILL. Note that this is the conservative change, to interrupt only for SIGKILL, by using fatal_sig...
Roland McGrathRoland McGrath
bd720c923f7execve: improve interactivity with large argumentscommit 7993bc1f4663c0db67bb8f0d98e6678145b387cd upstream. This adds a preemption point during the copying of the argument and environment strings for execve, in copy_strings(). There is already a preemption point in the count() loop, so this doesn't add any new points in the abstract sense. When the total argument+environment strings are very large, the time spent copying them can be much mo...
Roland McGrathRoland McGrath
8816b5d0170setup_arg_pages: diagnose excessive argument sizecommit 1b528181b2ffa14721fb28ad1bd539fe1732c583 upstream. The CONFIG_STACK_GROWSDOWN variant of setup_arg_pages() does not check the size of the argument/environment area on the stack. When it is unworkably large, shift_arg_pages() hits its BUG_ON. This is exploitable with a very large RLIMIT_STACK limit, to create a crash pretty easily. Check that the initial stack is not too large to make i...
Mike GalbraithMike Galbraith
c6e6bb4981efix suspend regression caused by commit 6f6198a[Not upstream in the same way, as it was fixed differently there] 6f6198a sched: kill migration thread in CPU_POST_DEAD instead of CPU_DEAD leaves migration threads lying about. Mask out CPU_TASKS_FROZEN. Signed-off-by: Mike Galbraith <> Signed-off-by: Greg Kroah-Hartman <>
Jacob PanJacob Pan
3a70a5068d0x86: detect scattered cpuid features earliercommit 1dedefd1a066a795a87afca9c0236e1a94de9bf6 upstream. Some extra CPU features such as ARAT is needed in early boot so that x86_init function pointers can be set up properly. At start_kernel() level, this patch moves init_scattered_cpuid_features() from check_bugs() to setup_arch() -> early_cpu_init() which is earlier than platform specific x86_init layer ...
Zhang RuiZhang Rui
a58d4d9dbd2ACPI: Disable Windows Vista compatibility for Toshiba P305Dcommit 337279ce3aa85d81d34c0f837d1c204df105103b upstream. Disable the Windows Vista (SP1) compatibility for Toshiba P305D. Signed-off-by: Zhang Rui <> Signed-off-by: Len Brown <> Signed-off-by: Greg Kroah-Hartman <>
Len BrownLen Brown
47de918e751ACPI: delete ZEPTO idle=nomwait DMI quirkcommit 64a32307b710c100beb101e9c78f8022f0e8ba61 upstream. per comments in the bug report, this entry seems to hurt at much as it helps. Signed-off-by: Len Brown <> Signed-off-by: Greg Kroah-Hartman <>
Len BrownLen Brown
4caeea1ab2cACPI: EC: add Vista incompatibility DMI entry for Toshiba Satellite L355commit 7a1d602f5fc35d14907b7da98d5627acb69589d1 upstream. Signed-off-by: Len Brown <> Signed-off-by: Greg Kroah-Hartman <>
Len BrownLen Brown
e6397535e29intel_idle: PCI quirk to prevent Lenovo Ideapad s10-3 boot hangcommit 4731fdcf6f7bdab3e369a3f844d4ea4d4017284d upstream. When the Lenovo Ideapad S10-3 is booted with HT enabled, it hits a boot hang in the intel_idle driver. This occurs when entering ATM-C4 for the first time, unless BM_STS is first cleared. acpi_idle doesn't see this because it first checks and clears BM_STS, but it would hit the same hang if that check were disabled. http://bugs.meego...S10-3
Colin Ian KingColin Ian King
2c41bbda398ACPI: enable repeated PCIEXP wakeup by clearing PCIEXP_WAKE_STS on resumecommit 573b638158029898caf9470c8214b7ddd29751e3 upstream. Section (PM1 Status Registers) of version 4.0 of the ACPI spec concerning PCIEXP_WAKE_STS points out in in the final note field in table 4-11 that if this bit is set to 1 and the system is put into a sleeping state then the system will not automatically wake. This bit gets set by hardware to indicate that the system woke up d...
Paul FertserPaul Fertser
c1faa695d62b44: fix carrier detection on bindcommit bcf64aa379fcadd074449cbf0c049da70071b06f upstream. For carrier detection to work properly when binding the driver with a cable unplugged, netif_carrier_off() should be called after register_netdev(), not before. Signed-off-by: Paul Fertser <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <>
Michael NeulingMichael Neuling
84d7536c1e8powerpc: Don't use kernel stack with translation offcommit 54a834043314c257210db2a9d59f8cc605571639 upstream. In f761622e59433130bc33ad086ce219feee9eb961 we changed early_setup_secondary so it's called using the proper kernel stack rather than the emergency one. Unfortunately, this stack pointer can't be used when translation is off on PHYP as this stack pointer might be outside the RMO. This results in the following on all non zero cpus: c...
Matt EvansMatt Evans
f9ca496a739powerpc: Initialise paca->kstack before early_setup_secondarycommit f761622e59433130bc33ad086ce219feee9eb961 upstream. As early setup calls down to slb_initialize(), we must have kstack initialised before checking "should we add a bolted SLB entry for our kstack?" Failing to do so means stack access requires an SLB miss exception to refill an entry dynamically, if the stack isn't accessible via SLB(0) (kernel text & static data). It's not always allow...
Ben HutchingsBen Hutchings
e25a2ee620dr6040: Fix multicast list iteration when hash filter is usedThis was fixed in mainline by the interface change made in commit f9dcbcc9e338d08c0f7de7eba4eaafbbb7f81249. After walking the multicast list to set up the hash filter, this function will walk off the end of the list when filling the exact-match entries. This was fixed in mainline by the interface change made in commit f9dcbcc9e338d08c0f7de7eba4eaafbbb7f81249. Reported-by:
Florian FainelliFlorian Fainelli
e3ddbfba3cdr6040: fix r6040_multicast_listcommit 3bcf8229a8c49769e48d3e0bd1e20d8e003f8106 upstream. As reported in <>, r6040_ multicast_list currently crashes. This is due a wrong maximum of multicast entries. This patch fixes the following issues with multicast: - number of maximum entries if off-by-one (4 instead of 3) - the writing of the hash table index is not necessary and leads...
FUJITA TomonoriFUJITA Tomonori
6cd36d86983bsg: fix incorrect device_status valuecommit 478971600e47cb83ff2d3c63c5c24f2b04b0d6a1 upstream. bsg incorrectly returns sg's masked_status value for device_status. [jejb: fix up expression logic] Reported-by: Douglas Gilbert <> Signed-off-by: FUJITA Tomonori <> Signed-off-by: James Bottomley <> Signed-off-by: Greg Kroah-Hartman <>
Stanislaw GruszkaStanislaw Gruszka
f462e0c4f1br8169: allocate with GFP_KERNEL flag when able to sleepcommit aeb19f6052b5e5c8a24aa444fbff73b84341beac upstream. We have fedora bug report where driver fail to initialize after suspend/resume because of memory allocation errors: To fix use GFP_KERNEL allocation where possible. Tested-by: Neal Becker <> Signed-off-by: Stanislaw Gruszka <> Acked-by: Eric Dumaz...
Stanislaw GruszkaStanislaw Gruszka
1198008fe22skge: add quirk to limit DMAcommit 392bd0cb000d4aac9e88e4f50823db85e7220688 upstream. Skge devices installed on some Gigabyte motherboards are not able to perform 64 dma correctly due to board PCI implementation, so limit DMA to 32bit if such boards are detected. Bug was reported here: Signed-off-by: Stanislaw Gruszka <> Tested-by: Luya Tshimbalanga ...
Jianzhao WangJianzhao Wang
2aff10f5670net: blackhole route should always be recalculated[ Upstream commit ae2688d59b5f861dc70a091d003773975d2ae7fb ] Blackhole routes are used when xfrm_lookup() returns -EREMOTE (error triggered by IKE for example), hence this kind of route is always temporary and so we should check if a better route exists for next packets. Bug has been introduced by commit d11a4dc18bf41719c9f0d7ed494d295dd2973b92. Signed-off-by: Jianzhao Wang <
David S. MillerDavid S. Miller
be743887feerose: Fix signedness issues wrt. digi count.[ Upstream commit 9828e6e6e3f19efcb476c567b9999891d051f52f ] Just use explicit casts, since we really can't change the types of structures exported to userspace which have been around for 15 years or so. Reported-by: Dan Rosenberg <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <>
Eric DumazetEric Dumazet
6a20bf09c27netxen: dont set skb->truesize[ Upstream commit 7e96dc7045bff8758804b047c0dfb6868f182500 ] skb->truesize is set in core network. Dont change it unless dealing with fragments. Signed-off-by: Eric Dumazet <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <>
Tom MarshallTom Marshall
898e8970e48tcp: Fix race in tcp_poll[ Upstream commit a4d258036ed9b2a1811c3670c6099203a0f284a0 ] If a RST comes in immediately after checking sk->sk_err, tcp_poll will return POLLIN but not POLLOUT. Fix this by checking sk->sk_err at the end of tcp_poll. Additionally, ensure the correct order of operations on SMP machines with memory barriers. Signed-off-by: Tom Marshall <> Signed-off-by: Eric Dumazet <eric....
Kees CookKees Cook
3765ba02027net: clear heap allocations for privileged ethtool actions[ Upstream commit b00916b189d13a615ff05c9242201135992fcda3 ] Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since the...
Eric DumazetEric Dumazet
cea06e60034ip: fix truesize mismatch in ip fragmentation[ Upstream commit 3d13008e7345fa7a79d8f6438150dc15d6ba6e9d ] Special care should be taken when slow path is hit in ip_fragment() : When walking through frags, we transfert truesize ownership from skb to frags. Then if we hit a slow_path condition, we must undo this or risk uncharging frags->truesize twice, and in the end, having negative socket sk_wmem_alloc counter, or even freeing socket so...
Maciej ŻenczykowskiMaciej Żenczykowski
da9d9968918net: Fix IPv6 PMTU disc. w/ asymmetric routes[ Upstream commit ae878ae280bea286ff2b1e1cb6e609dd8cb4501d ] Signed-off-by: Maciej Żenczykowski <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <>
Kumar SanghviKumar Sanghvi
81f9ffe4909Phonet: Correct header retrieval after pskb_may_pull[ Upstream commit a91e7d471e2e384035b9746ea707ccdcd353f5dd ] Retrieve the header after doing pskb_may_pull since, pskb_may_pull could change the buffer structure. This is based on the comment given by Eric Dumazet on Phonet Pipe controller patch for a similar problem. Signed-off-by: Kumar Sanghvi <> Acked-by: Linus Walleij <> Acked-by: ...
Nagendra TomarNagendra Tomar
a39fcb1368anet: Fix the condition passed to sk_wait_event()[ Upstream commit 482964e56e1320cb7952faa1932d8ecf59c4bf75 ] This patch fixes the condition (3rd arg) passed to sk_wait_event() in sk_stream_wait_memory(). The incorrect check in sk_stream_wait_memory() causes the following soft lockup in tcp_sendmsg() when the global tcp memory pool has exhausted. >>> snip <<< localhost kernel: BUG: soft lockup - CPU#3 stuck for 11s! [sshd:6429] localhost k...
David S. MillerDavid S. Miller
237a9f8f234tcp: Fix >4GB writes on 64-bit.[ Upstream commit 01db403cf99f739f86903314a489fb420e0e254f ] Fixes kernel bugzilla #16603 tcp_sendmsg() truncates iov_len to an 'int' which a 4GB write to write zero bytes, for example. There is also the problem higher up of how verify_iovec() works. It wants to prevent the total length from looking like an error return value. However it does this using 'int', but syscalls return 'long' (a...
Ulrich WeberUlrich Weber
0a3f7a263b2xfrm4: strip ECN and IP Precedence bits in policy lookup[ Upstream commit 94e2238969e89f5112297ad2a00103089dde7e8f ] dont compare ECN and IP Precedence bits in find_bundle and use ECN bit stripped TOS value in xfrm_lookup Signed-off-by: Ulrich Weber <> Signed-off-by: David S. Miller <> Signed-off-by: Greg Kroah-Hartman <>
Dave AirlieDave Airlie
94210a7fc93drm/radeon: fix PCI ID 5657 to be an RV410commit f459ffbdfd04edb4a8ce6eea33170eb057a5e695 upstream. fixes Signed-off-by: Dave Airlie <> Signed-off-by: Greg Kroah-Hartman <>
Linus TorvaldsLinus Torvalds
8e0ab4091c2De-pessimize rds_page_copy_usercommit 799c10559d60f159ab2232203f222f18fa3c4a5f upstream. Don't try to "optimize" rds_page_copy_user() by using kmap_atomic() and the unsafe atomic user mode accessor functions. It's actually slower than the straightforward code on any reasonable modern CPU. Back when the code was written (although probably not by the time it was actually merged, though), 32-bit x86 may have been the dominan...
Borislav PetkovBorislav Petkov
9482441b5c6x86, AMD, MCE thresholding: Fix the MCi_MISCj iteration ordercommit 6dcbfe4f0b4e17e289d56fa534b7ce5a6b7f63a3 upstream. This fixes possible cases of not collecting valid error info in the MCE error thresholding groups on F10h hardware. The current code contains a subtle problem of checking only the Valid bit of MSR0000_0413 (which is MC4_MISC0 - DRAM thresholding group) in its first iteration and breaking out if the bit is cleared. But (!), this MSR co...
Luca TettamantiLuca Tettamanti
0e032468da8atl1: fix resumecommit ec5a32f67c603b11d68eb283d94eb89a4f6cfce1 upstream. adapter->cmb.cmb is initialized when the device is opened and freed when it's closed. Accessing it unconditionally during resume results either in a crash (NULL pointer dereference, when the interface has not been opened yet) or data corruption (when the interface has been used and brought down adapter->cmb.cmb points to a deallocated m...
Johannes BergJohannes Berg
b381cabc483wext: fix potential private ioctl memory content leakcommit df6d02300f7c2fbd0fbe626d819c8e5237d72c62 upstream. When a driver doesn't fill the entire buffer, old heap contents may remain, and if it also doesn't update the length properly, this old heap content will be copied back to userspace. It is very unlikely that this happens in any of the drivers using private ioctls since it would show up as junk being reported by iwpriv, but it seems bet...
Joel BeckerJoel Becker
9921a24c5d5ocfs2: Don't walk off the end of fast symlinks.commit 1fc8a117865b54590acd773a55fbac9221b018f0 upstream. ocfs2 fast symlinks are NUL terminated strings stored inline in the inode data area. However, disk corruption or a local attacker could, in theory, remove that NUL. Because we're using strlen() (my fault, introduced in a731d1 when removing vfs_follow_link()), we could walk off the end of that string. Signed-off-by: Joel Becker <joel....
Yegor YefremovYegor Yefremov
606ac4acd0fi2c-pca: Fix waitforcompletion() return valuecommit 6abb930af064fb1cf4177d32e2c7bfb89eee0fe5 upstream. ret is still -1, if during the polling read_byte() returns at once with I2C_PCA_CON_SI set. So ret > 0 would lead *_waitforcompletion() to return 0, in spite of the proper behavior. The routine was rewritten, so that ret has always a proper value, before returning. Signed-off-by: Yegor Yefremov <> Reviewed-by...
Salman QaziSalman Qazi
0bd9ac380a4hrtimer: Preserve timer state in remove_hrtimer()commit f13d4f979c518119bba5439dd2364d76d31dcd3f upstream. The race is described as follows: CPU X CPU Y remove_hrtimer // state & QUEUED == 0 timer->state = CALLBACK unlock timer base timer->f(n) //very long hrtimer_start lock timer base remove_hrtimer // n...