netfilter: xtables: Return xt_conntrack v0 backIn commit 9e05ec4b1804a1ba51f61fe169aef9b86edcd3f7
the revision 0 of xt_conntrack was dropped which made
iptables-1.3.5 not funtional in VE.
Return compatibility back.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
iptables: Tables should be checked for permission via mask onlyThe sequence of module loading is not controllable by the kernel anymore
(due to KSYM removal). As result we may fail testing if dependant module is
already loaded(allowed for usage via config) at moment of granting the module
permissions to run in particular VE.
Instead the _MOD bits are used as flags pointing out that netns is borrowing
some resources and we need to release them at exit (we ...
netfiler: Introduce per-net stubs for l3proto_ipv4Prepare ground for future l3proto_ipv4 virtualization.
This snippets only setup pernet ops without any serious actions.
We still need to make sysctls netns compatible.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
netfilter: Do not create NAT rules if not allowedIn case if NAT is not allowed in particular VE we just drop the creation
of tuples for such VE (this way dropping this functionality).
Note that there is no need for setting up VE_NF_CONNTRACK_MOD in
nf_conntrack_net_init. We are going to get rid of module dependency checking
by completely switch to net-namespace functionality.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-b...
meminfo: Initialize mi.si before passing it to virtinfoOtherwise the listener (vecalls.c) will see grbage and may produce
bullshit in ve's /proc/meminfo
http://bugzilla.openvz.org/show_bug.cgi?id=1487
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Fix compile error in mm/slab.cCommit f385db6d4 (MM: Kmemsize accounting bits) introduced a syntax
error into mm/slab.c:
CC mm/slab.o
mm/slab.c: In function 'alloc_slabmgmt':
mm/slab.c:2687: error: too few arguments to function 'kmem_cache_alloc_node
mm/slab.c:2687: warning: left-hand operand of comma expression has no effec
mm/slab.c:2687: warning: statement with no effect
mm/slab.c:2687: error: expected '...
iptables, nat: Add missing flag that namespace is usedOtherwise we may leak the namespace resource.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
cpt: Save and restore task_user_gs().Without it 32bit container stops right after the restore
due to #GP.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
inotify: Return lost mntputs for inotify mntsOtherwise we leak the mountpoint and sometimes much more.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
devcg: Check for device permissions for DEV_ALL rulesThanks to cd500819 commit :\
http://bugzilla.openvz.org/show_bug.cgi?id=1478
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
GFS2: Skip check for mandatory locks when unlockingcommit 720e7749279bde0d08684b1bb4e7a2eedeec6394 upstream.
gfs2_lock() will skip locks on file which have mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped and will result in a BUG in locks_remove_flock().
gfs2_lock() should skip the check for mandatory locks when unlocking a file.
S...
x86: Fix sched_clock_cpu for systems with unsynchronized TSCcommit 14be1f7454ea96ee614467a49cf018a1a383b189 upstream.
On UV systems, the TSC is not synchronized across blades. The
sched_clock_cpu() function is returning values that can go
backwards (I've seen as much as 8 seconds) when switching
between cpus.
As each cpu comes up, early_init_intel() will currently set the
sched_clock_stable flag true. When mark_tsc_unstable() runs, it
clears the fl...
s3cmci: initialize default platform data no_wprotect and no_detect with 1commit c212808a1ba6bfba489006399b8152a047305acf upstream.
If no platform_data was givin to the device it's going to use it's default
platform data struct which has all fields initialized to zero. As a
result the driver is going to try to request gpio0 both as write protect
and card detect pin. Which of course will fail and makes the driver
unusable
Previously to the introduction of no_wprot...
block: Backport of various I/O topology fixes from 2.6.33 and 2.6.34block: Backport of various I/O topology fixes from 2.6.33 and 2.6.34
The stacking code incorrectly scaled up the data offset in some cases
causing misaligned devices to report alignment. Rewrite the stacking
algorithm to remedy this.
(Upstream commit 9504e0864b58b4a304820dcf3755f1da80d5e72f)
The top device misalignment flag would not be set if the added bottom
device was already misaligne...
b43: Workaround circular locking in hw-tkip key update callbackcommit 96869a39399269a776a94812e9fff3d38b47d838 upstream
The TKIP key update callback is called from the RX path, where the driver
mutex is already locked. This results in a circular locking bug.
Avoid this by removing the lock.
Johannes noted that there is a separate bug: The callback still breaks on SDIO
hardware, because SDIO hardware access needs to sleep, but we are not allowed
to sleep ...
Bluetooth: Fix kernel crash on L2CAP stress testscommit c2c77ec83bdad17fb688557b5b3fdc36661dd1c6 upstream.
Added very simple check that req buffer has enough space to
fit configuration parameters. Shall be enough to reject packets
with configuration size more than req buffer.
Crash trace below
[ 6069.659393] Unable to handle kernel paging request at virtual address 02000205
[ 6069.673034] Internal error: Oops: 805 [#1] PREEMPT
...
[ 6069.7...
Bluetooth: Fix potential bad memory access with sysfs filescommit 101545f6fef4a0a3ea8daf0b5b880df2c6a92a69 upstream.
When creating a high number of Bluetooth sockets (L2CAP, SCO
and RFCOMM) it is possible to scribble repeatedly on arbitrary
pages of memory. Ensure that the content of these sysfs files is
always less than one page. Even if this means truncating. The
files in question are scheduled to be moved over to debugfs in
the future anyway.
Base...
ahci: use BIOS date in broken_suspend listcommit 9deb343189b3cf45e84dd08480f330575ffe2004 upstream.
HP is recycling both DMI_PRODUCT_NAME and DMI_BIOS_VERSION making
ahci_broken_suspend() trigger for later products which are not
affected by the original problems. Match BIOS date instead of version
and add references to bko's so that full information can be found
easier later.
This fixes http://bugzilla.kernel.org/show_bug.cgi?id=154...
quota: Fix warning when a delayed write happens before quota is enabledcommit 0a5a9c725512461d19397490f3adf29931dca1f2 upstream.
If a delayed-allocation write happens before quota is enabled, the
kernel spits out a warning:
WARNING: at fs/quota/dquot.c:988 dquot_claim_space+0x77/0x112()
because the fact that user has some delayed allocation is not recorded
in quota structure.
Make dquot_initialize() update amount of reserved space for user if it sees
inode has ...
quota: manage reserved space when quota is not active [v2]commit c469070aea5a0ada45a836937c776fd3083dae2b upstream.
Since we implemented generic reserved space management interface,
then it is possible to account reserved space even when quota
is not active (similar to i_blocks/i_bytes).
Without this patch following testcase result in massive comlain from
WARN_ON in dquot_claim_space()
TEST_CASE:
mount /dev/sdb /mnt -oquota
dd if=/dev/zero of=/mnt/...
leds-gpio: fix default state handling on OF platformscommit 0493a4ff10959ff4c8e0d65efee25b7ffd4fa5db upstream.
The driver wrongly sets default state for LEDs that don't specify
default-state property.
Currently the driver handles default state this way:
memset(&led, 0, sizeof(led));
for_each_child_of_node(np, child) {
state = of_get_property(child, "default-state", NULL);
if (state) {
if (!strcmp(state, "keep"))
led.default_state = LEDS...
mac80211: Reset dynamic ps timer in Rx path.commit e15276a4b220c54db665cf46a92bd9ceb9aeb052 upstream.
The current mac80211 implementation enables power save if there
is no Tx traffic for a specific timeout. Hence, PS is triggered
even if there is a continuous Rx only traffic(like UDP) going on.
This makes the drivers to wait on the tim bit in the next beacon
to awake which leads to redundant sleep-wake cycles.
Fix this by restarting the...
ath9k: Enable IEEE80211_HW_REPORTS_TX_ACK_STATUS flag for ath9kcommit 05df49865be08b30e7ba91b9d3d94d7d52dd3033 upstream.
Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
mac80211: Retry null data frame for power savecommit 375177bf35efc08e1bd37bbda4cc0c8cc4db8500 upstream.
Even if the null data frame is not acked by the AP, mac80211
goes into power save. This might lead to loss of frames
from the AP.
Prevent this by restarting dynamic_ps_timer when ack is not
received for null data frames.
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by:...
ath9k: Enable TIM timer interrupt only when needed.commit 3f7c5c10e9dc6bf90179eb9f7c06151d508fb324 upstream.
The TIM timer interrupt is enabled even before the ACK of nullqos
is received which is unnecessary.
Also clean up the CONF_PS part of config callback properly for
better readability.
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Luis R. Rodrigu...
ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)commit 950200e2ff11daae1c5d9426703bdd494603f38b upstream.
BugLink: https://bugs.launchpad.net/bugs/418627
The original reporter states that this quirk is necessary to obtain
reasonable gain for playback. Without it, sound is inaudible. Tested
with playback (spkr and hp) and capture.
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by:...
ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklistcommit e1f7f02b45cf33a774d56e505ce1718af9392f5e upstream.
BugLink: https://launchpad.net/bugs/303789
This model needs both 'Headphone Jack Sense' and 'Line Jack Sense'
muted for audible audio, so just add its SSID to the blacklist and
don't enumerate the controls.
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <...
ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklistcommit 5cd165e7057020884e430941c24454d3df9a799d upstream.
BugLink: https://launchpad.net/bugs/481058
The OR has verified that both 'Headphone Jack Sense' and 'Line Jack Sense'
need to be muted for sound to be audible, so just add the machine's SSID
to the ac97 jack sense blacklist.
Reported-by: Richard Gagne
Tested-by: Richard Gagne
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-of...
ALSA: hda: Use LPIB for ga-ma770-ud3 boardcommit 9ec8ddad59fadd8021adfea4cb716a49b0e232e9 upstream.
BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575669
The OR states that position_fix=1 is necessary to work around glitching
during volume adjustments using PulseAudio.
Reported-by: Carlos Laviola <claviola@debian.org>
Tested-by: Carlos Laviola <claviola@debian.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-...
hwmon: (coretemp) Add missing newline to dev_warn() messagecommit 4d7a5644e4adfafe76c2bd8ee168e3f3b5dae3a8 upstream.
Add missing newline to dev_warn() message string. This is more of an issue
with older kernels that don't automatically add a newline if it was missing
from the end of the previous line.
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
x86, amd: Restrict usage of c1e_idle()commit 035a02c1e1de31888e8b6adac0ff667971ac04db upstream.
Currently c1e_idle returns true for all CPUs greater than or equal to
family 0xf model 0x40. This covers too many CPUs.
Meanwhile a respective erratum for the underlying problem was filed
(#400). This patch adds the logic to check whether erratum #400
applies to a given CPU.
Especially for CPUs where SMI/HW triggered C1e is not support...
x86: Fix placement of FIX_OHCI1394_BASEcommit ff30a0543e9a6cd732582063e7cae951cdb7acf2 upstream.
Ever for 32-bit with sufficiently high NR_CPUS, and starting
with commit 789d03f584484af85dbdc64935270c8e45f36ef7 also for
64-bit, the statically allocated early fixmap page tables were
not covering FIX_OHCI1394_BASE, leading to a boot time crash
when "ohci1394_dma=early" was used. Despite this entry not being
a permanently used one, it...
netfilter: xt_recent: fix regression in rules using a zero hit_countcommit ef1691504c83ba3eb636c0cfd3ed33f7a6d0b4ee upstream.
Commit 8ccb92ad (netfilter: xt_recent: fix false match) fixed supposedly
false matches in rules using a zero hit_count. As it turns out there is
nothing false about these matches and people are actually using entries
with a hit_count of zero to make rules dependant on addresses inserted
manually through /proc.
Since this slipped past t...
softlockup: Stop spurious softlockup messages due to overflowcommit 8c2eb4805d422bdbf60ba00ff233c794d23c3c00 upstream.
Ensure additions on touch_ts do not overflow. This can occur
when the top 32 bits of the TSC reach 0xffffffff causing
additions to touch_ts to overflow and this in turn generates
spurious softlockup warnings.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Eric Dumazet <eric.dum...
cpuset: fix the problem that cpuset_mem_spread_node() returns an offline nodecommit 5ab116c9349ef52d6fbd2e2917a53f13194b048e upstream.
cpuset_mem_spread_node() returns an offline node, and causes an oops.
This patch fixes it by initializing task->mems_allowed to
node_states[N_HIGH_MEMORY], and updating task->mems_allowed when doing
memory hotplug.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Reported-by: Nick Piggin <n...
ath9k: fix BUG_ON triggered by PAE framescommit 4fdec031b9169b3c17938b9c4168f099f457169c upstream.
When I initially stumbled upon sequence number problems with PAE frames
in ath9k, I submitted a patch to remove all special cases for PAE
frames and let them go through the normal transmit path.
Out of concern about crypto incompatibility issues, this change was
merged instead:
commit 6c8afef551fef87a3bf24f8a74c69a7f2f72fc82
Author: Su...
rt2860sta: Fix argument to linux_pci_unmap_single()John Halton wrote in <http://bugs.debian.org/575726>:
> Whenever wpa_supplicant is deactivated (whether by killing the process or
> during a normal shutdown) I am getting a kerneloops that prevents the
> computer from completing shutdown. Here is the relevant syslog output:
The backtrace points to an incorrect call from RTMPFreeTxRxRingMemory()
into linux_pci_unmap_single(). This appears to h...
PCI: cleanup error return for pcix get and set mmrbc functionscommit 7c9e2b1c4784c6e574f69dbd904b2822f2e04d6e upstream.
pcix_get_mmrbc() returns the maximum memory read byte count (mmrbc), if
successful, or an appropriate error value, if not.
Distinguishing errors from correct values and understanding the meaning of an
error can be somewhat confusing in that:
correct values: 512, 1024, 2048, 4096
errors: -EINVAL -22
PCIBIOS_FUNC_NOT_SUPPORTED ...
PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functionscommit bdc2bda7c4dd253026cc1fce45fc939304749029 upstream.
An e1000 driver on a system with a PCI-X bus was always being returned
a value of 135 from both pcix_get_mmrbc() and pcix_set_mmrbc(). This
value reflects an error return of PCIBIOS_BAD_REGISTER_NUMBER from
pci_bus_read_config_dword(,, cap + PCI_X_CMD,).
This is because for a dword, the following portion of the PCI_OP_READ()
macro:
i...
PCI: fix return value from pcix_get_max_mmrbc()commit 25daeb550b69e89aff59bc6a84218a12b5203531 upstream.
For the PCI_X_STATUS register, pcix_get_max_mmrbc() is returning an incorrect
value, which is based on:
(stat & PCI_X_STATUS_MAX_READ) >> 12
Valid return values are 512, 1024, 2048, 4096, which correspond to a 'stat'
(masked and right shifted by 21) of 0, 1, 2, 3, respectively.
A right shift by 11 would generate the correct return v...
fs/partition/msdos: fix unusable extended partition for > 512B sectorcommit 8e0cc811e0f8029a7225372fb0951fab102c012f upstream.
Smaller size than a minimum blocksize can't be used, after all it's
handled like 0 size.
For extended partition itself, this makes sure to use bigger size than one
logical sector size at least.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Daniel Taylor <Daniel.Taylor@wdc.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Sig...
fs/partitions/msdos: add support for large diskscommit 3fbf586cf7f245392142e5407c2a56f1cff979b6 upstream.
In order to use disks larger than 2TiB on Windows XP, it is necessary to
use 4096-byte logical sectors in an MBR.
Although the kernel storage and functions called from msdos.c used
"sector_t" internally, msdos.c still used u32 variables, which results in
the ability to handle XP-compatible large disks.
This patch changes the internal ...
if_tunnel.h: add missing ams/byteorder.h includecommit 9bf35c8dddd56f7f247a27346f74f5adc18071f4 upstream.
When compiling userspace application which includes
if_tunnel.h and uses GRE_* defines you will get undefined
reference to __cpu_to_be16.
Fix this by adding missing #include <asm/byteorder.h>
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hart...
Pavel Emelyanov
Greg Kroah-Hartman
