Linux 3.3.3
This commit is contained in:
Josh Boyer
parent
f3ba8d1a96
commit
6e2468ba3e
|
|
@ -1,58 +0,0 @@
|
|||
From 9498ba7a1d38d42eef4ef6d906ab1743c9f0fd6f Mon Sep 17 00:00:00 2001
|
||||
From: Eran <eran@over-here.org>
|
||||
Date: Mon, 5 Dec 2011 22:15:29 +0000
|
||||
Subject: [PATCH] Bluetooth: Adding USB device 13d3:3375 as an Atheros AR3012.
|
||||
|
||||
The bluetooth module in the Asus UX31/UX21 is based on Atheros AR3012
|
||||
and requires a firmware to be uploaded before it's usable.
|
||||
|
||||
output of usb-devices for this module:
|
||||
T: Bus=01 Lev=02 Prnt=02 Port=07 Cnt=03 Dev#= 6 Spd=12 MxCh= 0
|
||||
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
|
||||
P: Vendor=13d3 ProdID=3375 Rev=00.02
|
||||
S: Manufacturer=Atheros Communications
|
||||
S: Product=Bluetooth USB Host Controller
|
||||
S: SerialNumber=Alaska Day 2006
|
||||
C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
|
||||
I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
|
||||
I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
|
||||
|
||||
Signed-off-by: Eran <eran@over-here.org>
|
||||
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
|
||||
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
|
||||
|
||||
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
|
||||
index 4eca6e5..4844247 100644
|
||||
--- a/drivers/bluetooth/ath3k.c
|
||||
+++ b/drivers/bluetooth/ath3k.c
|
||||
@@ -72,6 +72,7 @@ static struct usb_device_id ath3k_table[] = {
|
||||
|
||||
/* Atheros AR3012 with sflash firmware*/
|
||||
{ USB_DEVICE(0x0CF3, 0x3004) },
|
||||
+ { USB_DEVICE(0x13d3, 0x3375) },
|
||||
|
||||
/* Atheros AR5BBU12 with sflash firmware */
|
||||
{ USB_DEVICE(0x0489, 0xE02C) },
|
||||
@@ -88,6 +89,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
|
||||
|
||||
/* Atheros AR3012 with sflash firmware*/
|
||||
{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
|
||||
+ { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
|
||||
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 22f695e..480cad9 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -129,6 +129,7 @@ static struct usb_device_id blacklist_table[] = {
|
||||
|
||||
/* Atheros 3012 with sflash firmware */
|
||||
{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
|
||||
+ { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
|
||||
|
||||
/* Atheros AR5BBU12 with sflash firmware */
|
||||
{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 639c55c706fbff840d95ea807a2949adf3779455 Mon Sep 17 00:00:00 2001
|
||||
From 268671ffd23264564a62c0893135e2e42e8c4f66 Mon Sep 17 00:00:00 2001
|
||||
From: Eugeni Dodonov <eugeni.dodonov@intel.com>
|
||||
Date: Fri, 23 Mar 2012 11:57:18 -0300
|
||||
Subject: [PATCH 1/2] drm/i915: allow to select rc6 modes via kernel parameter
|
||||
Subject: [PATCH] drm/i915: allow to select rc6 modes via kernel parameter
|
||||
|
||||
This allows to select which rc6 modes are to be used via kernel parameter,
|
||||
via a bitmask parameter. E.g.:
|
||||
|
|
@ -35,12 +35,12 @@ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|||
3 files changed, 42 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
|
||||
index 308f819..abb2248 100644
|
||||
index 84ecbb9..7990e27 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_drv.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_drv.c
|
||||
@@ -66,7 +66,11 @@ MODULE_PARM_DESC(semaphores,
|
||||
int i915_enable_rc6 __read_mostly = -1;
|
||||
module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);
|
||||
module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0400);
|
||||
MODULE_PARM_DESC(i915_enable_rc6,
|
||||
- "Enable power-saving render C-state 6 (default: -1 (use per-chip default)");
|
||||
+ "Enable power-saving render C-state 6. "
|
||||
|
|
@ -84,10 +84,10 @@ index 9689ca3..a7d488e 100644
|
|||
extern int i915_max_ioctl;
|
||||
extern unsigned int i915_fbpercrtc __always_unused;
|
||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
||||
index 397087c..1430f09 100644
|
||||
index 2163818..dc90644 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
||||
@@ -8132,7 +8132,7 @@ void intel_init_emon(struct drm_device *dev)
|
||||
@@ -8138,7 +8138,7 @@ void intel_init_emon(struct drm_device *dev)
|
||||
dev_priv->corr = (lcfuse & LCFUSE_HIV_MASK);
|
||||
}
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ index 397087c..1430f09 100644
|
|||
{
|
||||
/*
|
||||
* Respect the kernel parameter if it is set
|
||||
@@ -8163,6 +8163,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
|
||||
@@ -8169,6 +8169,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
|
||||
u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);
|
||||
u32 pcu_mbox, rc6_mask = 0;
|
||||
int cur_freq, min_freq, max_freq;
|
||||
|
|
@ -104,7 +104,7 @@ index 397087c..1430f09 100644
|
|||
int i;
|
||||
|
||||
/* Here begins a magic sequence of register writes to enable
|
||||
@@ -8193,9 +8194,20 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
|
||||
@@ -8199,9 +8200,20 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
|
||||
I915_WRITE(GEN6_RC6p_THRESHOLD, 100000);
|
||||
I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */
|
||||
|
||||
|
|
@ -129,5 +129,5 @@ index 397087c..1430f09 100644
|
|||
I915_WRITE(GEN6_RC_CONTROL,
|
||||
rc6_mask |
|
||||
--
|
||||
1.7.9.3
|
||||
1.7.7.6
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
From d52fc5dde171f030170a6cb78034d166b13c9445 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Paris <eparis@redhat.com>
|
||||
Date: Tue, 17 Apr 2012 16:26:54 -0400
|
||||
Subject: [PATCH] fcaps: clear the same personality flags as suid when fcaps
|
||||
are used
|
||||
|
||||
If a process increases permissions using fcaps all of the dangerous
|
||||
personality flags which are cleared for suid apps should also be cleared.
|
||||
Thus programs given priviledge with fcaps will continue to have address space
|
||||
randomization enabled even if the parent tried to disable it to make it
|
||||
easier to attack.
|
||||
|
||||
Signed-off-by: Eric Paris <eparis@redhat.com>
|
||||
Reviewed-by: Serge Hallyn <serge.hallyn@canonical.com>
|
||||
Signed-off-by: James Morris <james.l.morris@oracle.com>
|
||||
---
|
||||
security/commoncap.c | 5 +++++
|
||||
1 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/security/commoncap.c b/security/commoncap.c
|
||||
index 0cf4b53..0ecf4ba 100644
|
||||
--- a/security/commoncap.c
|
||||
+++ b/security/commoncap.c
|
||||
@@ -505,6 +505,11 @@ int cap_bprm_set_creds(struct linux_binprm *bprm)
|
||||
}
|
||||
skip:
|
||||
|
||||
+ /* if we have fs caps, clear dangerous personality flags */
|
||||
+ if (!cap_issubset(new->cap_permitted, old->cap_permitted))
|
||||
+ bprm->per_clear |= PER_CLEAR_ON_SETID;
|
||||
+
|
||||
+
|
||||
/* Don't let someone trace a set[ug]id/setpcap binary with the revised
|
||||
* credentials unless they have the appropriate permit
|
||||
*/
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
25
kernel.spec
25
kernel.spec
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 8
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -66,7 +66,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 2
|
||||
%define stable_update 3
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -724,7 +724,6 @@ Patch14001: hibernate-watermark.patch
|
|||
Patch14010: lis3-improve-handling-of-null-rate.patch
|
||||
|
||||
Patch15000: bluetooth-use-after-free.patch
|
||||
Patch15001: Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch
|
||||
|
||||
Patch19000: ips-noirq.patch
|
||||
|
||||
|
|
@ -776,10 +775,6 @@ Patch21380: wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch
|
|||
#rhbz 807632
|
||||
Patch21385: libata-forbid-port-runtime-pm-by-default.patch
|
||||
|
||||
#rhbz 809014
|
||||
Patch21390: x86-Use-correct-byte-sized-register-constraint-in-__xchg_op.patch
|
||||
Patch21391: x86-Use-correct-byte-sized-register-constraint-in-__add.patch
|
||||
|
||||
Patch21400: unhandled-irqs-switch-to-polling.patch
|
||||
|
||||
#rhbz 808207 CVE-2012-1601
|
||||
|
|
@ -807,10 +802,6 @@ Patch22006: KVM-unmap-pages-from-the-iommu-when-slots-are-removed.patch
|
|||
#rhbz 814278 814289 CVE-2012-2119
|
||||
Patch22007: macvtap-zerocopy-validate-vector-length.patch
|
||||
|
||||
#rhbz 814523 806722 CVE-2012-2123
|
||||
Patch22008: fcaps-clear-the-same-personality-flags-as-suid-when-.patch
|
||||
Patch22009: security-fix-compile-error-in-commoncap.c.patch
|
||||
|
||||
#rhbz 811225
|
||||
Patch22010: memblock-memblock-should-be-able-to-handle-zero-leng.patch
|
||||
|
||||
|
|
@ -1498,7 +1489,6 @@ ApplyPatch hibernate-watermark.patch
|
|||
ApplyPatch lis3-improve-handling-of-null-rate.patch
|
||||
|
||||
ApplyPatch bluetooth-use-after-free.patch
|
||||
ApplyPatch Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch
|
||||
|
||||
ApplyPatch ips-noirq.patch
|
||||
|
||||
|
|
@ -1552,10 +1542,6 @@ ApplyPatch wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch
|
|||
#rhbz 807632
|
||||
ApplyPatch libata-forbid-port-runtime-pm-by-default.patch
|
||||
|
||||
#rhbz 809014
|
||||
ApplyPatch x86-Use-correct-byte-sized-register-constraint-in-__xchg_op.patch
|
||||
ApplyPatch x86-Use-correct-byte-sized-register-constraint-in-__add.patch
|
||||
|
||||
#selinux ptrace child permissions
|
||||
ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
|
||||
|
||||
|
|
@ -1576,10 +1562,6 @@ ApplyPatch KVM-unmap-pages-from-the-iommu-when-slots-are-removed.patch
|
|||
#rhbz 814278 814289 CVE-2012-2119
|
||||
ApplyPatch macvtap-zerocopy-validate-vector-length.patch
|
||||
|
||||
#rhbz 814523 806722 CVE-2012-2123
|
||||
ApplyPatch fcaps-clear-the-same-personality-flags-as-suid-when-.patch
|
||||
ApplyPatch security-fix-compile-error-in-commoncap.c.patch
|
||||
|
||||
#rhbz 811225
|
||||
ApplyPatch memblock-memblock-should-be-able-to-handle-zero-leng.patch
|
||||
|
||||
|
|
@ -2439,6 +2421,9 @@ fi
|
|||
# '-' | |
|
||||
# '-'
|
||||
%changelog
|
||||
* Mon Apr 23 2012 Josh Boyer <jwboyer@redhat.com>
|
||||
- Linux 3.3.3
|
||||
|
||||
* Mon Apr 23 2012 Peter Hutterer <peter.hutterer@redhat.com>
|
||||
- Fix regression on clickpads
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 51b79bee627d526199b2f6a6bef8ee0c0739b6d1 Mon Sep 17 00:00:00 2001
|
||||
From: Jonghwan Choi <jhbird.choi@samsung.com>
|
||||
Date: Wed, 18 Apr 2012 17:23:04 -0400
|
||||
Subject: [PATCH] security: fix compile error in commoncap.c
|
||||
|
||||
Add missing "personality.h"
|
||||
security/commoncap.c: In function 'cap_bprm_set_creds':
|
||||
security/commoncap.c:510: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
|
||||
security/commoncap.c:510: error: (Each undeclared identifier is reported only once
|
||||
security/commoncap.c:510: error: for each function it appears in.)
|
||||
|
||||
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
|
||||
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
|
||||
Signed-off-by: James Morris <james.l.morris@oracle.com>
|
||||
---
|
||||
security/commoncap.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
--- linux-3.3.2-6.fc17.noarch.orig/security/commoncap.c
|
||||
+++ linux-3.3.2-6.fc17.noarch/security/commoncap.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <linux/prctl.h>
|
||||
#include <linux/securebits.h>
|
||||
#include <linux/user_namespace.h>
|
||||
+#include <linux/personality.h>
|
||||
|
||||
/*
|
||||
* If a non-root user executes a setuid-root binary in
|
||||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
7133f5a2086a7d7ef97abac610c094f5 linux-3.3.tar.xz
|
||||
68907107b0f62a19608588bdb6b29e20 patch-3.3.2.xz
|
||||
634a088d3789870885dc6ee1eb9627d4 patch-3.3.3.xz
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From: H. Peter Anvin <hpa@zytor.com>
|
||||
Date: Fri, 6 Apr 2012 16:30:57 +0000 (-0700)
|
||||
Subject: x86: Use correct byte-sized register constraint in __add()
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Ftip.git;a=commitdiff_plain;h=8c91c5325e107ec17e40a59a47c6517387d64eb7
|
||||
|
||||
x86: Use correct byte-sized register constraint in __add()
|
||||
|
||||
Similar to:
|
||||
|
||||
2ca052a x86: Use correct byte-sized register constraint in __xchg_op()
|
||||
|
||||
... the __add() macro also needs to use a "q" constraint in the
|
||||
byte-sized case, lest we try to generate an illegal register.
|
||||
|
||||
Link: http://lkml.kernel.org/r/4F7A3315.501@goop.org
|
||||
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
||||
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
|
||||
Cc: Leigh Scott <leigh123linux@googlemail.com>
|
||||
Cc: Thomas Reitmayr <treitmayr@devbase.at>
|
||||
Cc: <stable@vger.kernel.org> v3.3
|
||||
---
|
||||
|
||||
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
|
||||
index bc18d0e..99480e5 100644
|
||||
--- a/arch/x86/include/asm/cmpxchg.h
|
||||
+++ b/arch/x86/include/asm/cmpxchg.h
|
||||
@@ -173,7 +173,7 @@ extern void __add_wrong_size(void)
|
||||
switch (sizeof(*(ptr))) { \
|
||||
case __X86_CASE_B: \
|
||||
asm volatile (lock "addb %b1, %0\n" \
|
||||
- : "+m" (*(ptr)) : "ri" (inc) \
|
||||
+ : "+m" (*(ptr)) : "qi" (inc) \
|
||||
: "memory", "cc"); \
|
||||
break; \
|
||||
case __X86_CASE_W: \
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From: Jeremy Fitzhardinge <jeremy@goop.org>
|
||||
Date: Mon, 2 Apr 2012 23:15:33 +0000 (-0700)
|
||||
Subject: x86: Use correct byte-sized register constraint in __xchg_op()
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Ftip.git;a=commitdiff_plain;h=2ca052a3710fac208eee690faefdeb8bbd4586a1
|
||||
|
||||
x86: Use correct byte-sized register constraint in __xchg_op()
|
||||
|
||||
x86-64 can access the low half of any register, but i386 can only do
|
||||
it with a subset of registers. 'r' causes compilation failures on i386,
|
||||
but 'q' expresses the constraint properly.
|
||||
|
||||
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
|
||||
Link: http://lkml.kernel.org/r/4F7A3315.501@goop.org
|
||||
Reported-by: Leigh Scott <leigh123linux@googlemail.com>
|
||||
Tested-by: Thomas Reitmayr <treitmayr@devbase.at>
|
||||
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
||||
Cc: <stable@vger.kernel.org> v3.3
|
||||
---
|
||||
|
||||
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
|
||||
index b3b7332..bc18d0e 100644
|
||||
--- a/arch/x86/include/asm/cmpxchg.h
|
||||
+++ b/arch/x86/include/asm/cmpxchg.h
|
||||
@@ -43,7 +43,7 @@ extern void __add_wrong_size(void)
|
||||
switch (sizeof(*(ptr))) { \
|
||||
case __X86_CASE_B: \
|
||||
asm volatile (lock #op "b %b0, %1\n" \
|
||||
- : "+r" (__ret), "+m" (*(ptr)) \
|
||||
+ : "+q" (__ret), "+m" (*(ptr)) \
|
||||
: : "memory", "cc"); \
|
||||
break; \
|
||||
case __X86_CASE_W: \
|
||||
Loading…
Reference in New Issue