Linux v4.3-rc1-131-ga7d5c18
This commit is contained in:
Laura Abbott
parent
428887cbbc
commit
beeefc570c
|
|
@ -29,6 +29,7 @@ CONFIG_ARM64_ERRATUM_827319=y
|
|||
CONFIG_ARM64_ERRATUM_824069=y
|
||||
CONFIG_ARM64_ERRATUM_819472=y
|
||||
CONFIG_ARM64_ERRATUM_832075=y
|
||||
CONFIG_ARM64_ERRATUM_843419=y
|
||||
|
||||
# AMBA / VExpress
|
||||
# CONFIG_RTC_DRV_PL030 is not set
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 1
|
||||
# The git snapshot level
|
||||
%define gitrev 3
|
||||
%define gitrev 4
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -585,12 +585,8 @@ Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
|
|||
#rhbz 1239050
|
||||
Patch509: ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch
|
||||
|
||||
Patch519: security-device_cgroup-fix-RCU-lockdep-splat.patch
|
||||
Patch520: ARM-dts-Fix-Makefile-target-for-sun4i-a10-itead-itea.patch
|
||||
|
||||
#rhbz 1258223
|
||||
Patch521: x86-alternatives-Make-optimize_nops-interrupt-safe-a.patch
|
||||
|
||||
#rhbz 1237136
|
||||
Patch522: block-blkg_destroy_all-should-clear-q-root_blkg-and-.patch
|
||||
|
||||
|
|
@ -2044,6 +2040,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Sep 18 2015 Laura Abbott <labbott@redhat.com> - 4.3.0-0.rc1.git4.1
|
||||
- Linux v4.3-rc1-131-ga7d5c18
|
||||
|
||||
* Fri Sep 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Fix oops in 32-bit kernel on 64-bit AMD cpus (rhbz 1263762)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
From 85f4e5ec7bbb5f8d7cc023a12af39d76c05cd204 Mon Sep 17 00:00:00 2001
|
||||
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
|
||||
Date: Wed, 2 Sep 2015 17:14:33 -0700
|
||||
Subject: [PATCH] security: device_cgroup: fix RCU lockdep splat
|
||||
|
||||
On Wed, Sep 02, 2015 at 12:24:50PM -0400, Tejun Heo wrote:
|
||||
> cc'ing Paul.
|
||||
>
|
||||
> On Wed, Sep 02, 2015 at 08:12:28AM -0500, Felipe Balbi wrote:
|
||||
> > while booting AM437x device, the following splat
|
||||
> > triggered:
|
||||
> >
|
||||
> > [ 12.005238] ===============================
|
||||
> > [ 12.009749] [ INFO: suspicious RCU usage. ]
|
||||
> > [ 12.014116] 4.2.0-next-20150831 #1154 Not tainted
|
||||
> > [ 12.019050] -------------------------------
|
||||
> > [ 12.023408] security/device_cgroup.c:405 device_cgroup:verify_new_ex called without proper synchronization!
|
||||
> ...
|
||||
> > [ 12.128326] [<c0317a04>] (verify_new_ex) from [<c0317f50>] (devcgroup_access_write+0x374/0x658)
|
||||
> > [ 12.137426] [<c0317f50>] (devcgroup_access_write) from [<c00d2800>] (cgroup_file_write+0x28/0x1bc)
|
||||
> > [ 12.146796] [<c00d2800>] (cgroup_file_write) from [<c01f1670>] (kernfs_fop_write+0xc0/0x1b8)
|
||||
> > [ 12.155620] [<c01f1670>] (kernfs_fop_write) from [<c0177c94>] (__vfs_write+0x1c/0xd8)
|
||||
> > [ 12.163783] [<c0177c94>] (__vfs_write) from [<c0178594>] (vfs_write+0x90/0x16c)
|
||||
> > [ 12.171426] [<c0178594>] (vfs_write) from [<c0178db4>] (SyS_write+0x44/0x9c)
|
||||
> > [ 12.178806] [<c0178db4>] (SyS_write) from [<c000f680>] (ret_fast_syscall+0x0/0x1c)
|
||||
>
|
||||
> This shouldn't be happening because devcgroup_access_write() always
|
||||
> grabs devcgroup_mutex. Looking at the log, the culprit seems to be
|
||||
> f78f5b90c4ff ("rcu: Rename rcu_lockdep_assert() to
|
||||
> RCU_LOCKDEP_WARN()"). It missed the bang for the second test while
|
||||
> inverting it, so adding rcu_read_lock() isn't the right fix here.
|
||||
>
|
||||
> Paul, can you please fix it?
|
||||
|
||||
Gah! Please see below.
|
||||
|
||||
Thanx, Paul
|
||||
|
||||
------------------------------------------------------------------------
|
||||
|
||||
security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition
|
||||
|
||||
f78f5b90c4ff ("rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()")
|
||||
introduced a bug by incorrectly inverting the condition when moving from
|
||||
rcu_lockdep_assert() to RCU_LOCKDEP_WARN(). This commit therefore fixes
|
||||
the inversion.
|
||||
|
||||
Reported-by: Felipe Balbi <balbi@ti.com>
|
||||
Reported-by: Tejun Heo <tj@kernel.org>
|
||||
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
|
||||
Cc: Serge Hallyn <serge@hallyn.com>
|
||||
---
|
||||
security/device_cgroup.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
|
||||
index 73455089feef..03c1652c9a1f 100644
|
||||
--- a/security/device_cgroup.c
|
||||
+++ b/security/device_cgroup.c
|
||||
@@ -401,7 +401,7 @@ static bool verify_new_ex(struct dev_cgroup *dev_cgroup,
|
||||
bool match = false;
|
||||
|
||||
RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&
|
||||
- lockdep_is_held(&devcgroup_mutex),
|
||||
+ !lockdep_is_held(&devcgroup_mutex),
|
||||
"device_cgroup:verify_new_ex called without proper synchronization");
|
||||
|
||||
if (dev_cgroup->behavior == DEVCG_DEFAULT_ALLOW) {
|
||||
--
|
||||
2.4.3
|
||||
|
||||
2
sources
2
sources
|
|
@ -1,4 +1,4 @@
|
|||
3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz
|
||||
4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz
|
||||
45904fd88e2d6f79693abcce148a12fe patch-4.3-rc1.xz
|
||||
3e0bea6ffdb570d80e79984b951b7e49 patch-4.3-rc1-git3.xz
|
||||
0b736f1395aead55095ff8920f95befe patch-4.3-rc1-git4.xz
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
From 0279e7aded382011be52a2ad340fbfdbf15e75be Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 3 Sep 2015 12:41:47 +0200
|
||||
Subject: [PATCH] x86/alternatives: Make optimize_nops() interrupt safe and
|
||||
synced
|
||||
|
||||
optimize_nops() is buggy in two aspects:
|
||||
|
||||
- It's not disabling interrupts across the modification
|
||||
- It's lacking a sync_core() call
|
||||
|
||||
Fixes: 4fd4b6e5537c 'x86/alternatives: Use optimized NOPs for padding'
|
||||
Reported-by: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
---
|
||||
arch/x86/kernel/alternative.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
|
||||
index c42827eb86cf..25f909362b7a 100644
|
||||
--- a/arch/x86/kernel/alternative.c
|
||||
+++ b/arch/x86/kernel/alternative.c
|
||||
@@ -338,10 +338,15 @@ done:
|
||||
|
||||
static void __init_or_module optimize_nops(struct alt_instr *a, u8 *instr)
|
||||
{
|
||||
+ unsigned long flags;
|
||||
+
|
||||
if (instr[0] != 0x90)
|
||||
return;
|
||||
|
||||
+ local_irq_save(flags);
|
||||
add_nops(instr + (a->instrlen - a->padlen), a->padlen);
|
||||
+ sync_core();
|
||||
+ local_irq_restore(flags);
|
||||
|
||||
DUMP_BYTES(instr, a->instrlen, "%p: [%d:%d) optimized NOPs: ",
|
||||
instr, a->instrlen - a->padlen, a->padlen);
|
||||
--
|
||||
2.4.3
|
||||
|
||||
Loading…
Reference in New Issue