Linux v4.10.4
This commit is contained in:
Justin M. Forbes
parent
de2ecea45f
commit
39bd1a1488
|
|
@ -1,29 +0,0 @@
|
|||
From 81c53729ee7c7f721c357ed3b531ebc97ca44051 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Anholt <eric@anholt.net>
|
||||
Date: Wed, 15 Feb 2017 11:57:57 -0800
|
||||
Subject: [PATCH] i2c-bcm2835: Debug test for curr_msg
|
||||
|
||||
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/i2c/busses/i2c-bcm2835.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
|
||||
index c3436f627028..a75fab4dd660 100644
|
||||
--- a/drivers/i2c/busses/i2c-bcm2835.c
|
||||
+++ b/drivers/i2c/busses/i2c-bcm2835.c
|
||||
@@ -195,7 +195,10 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data)
|
||||
}
|
||||
|
||||
if (val & BCM2835_I2C_S_DONE) {
|
||||
- if (i2c_dev->curr_msg->flags & I2C_M_RD) {
|
||||
+ if (!i2c_dev->curr_msg) {
|
||||
+ dev_info(i2c_dev->dev,
|
||||
+ "Processing DONE interrupt with no msg\n");
|
||||
+ } else if (i2c_dev->curr_msg->flags & I2C_M_RD) {
|
||||
bcm2835_drain_rxfifo(i2c_dev);
|
||||
val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
12
kernel.spec
12
kernel.spec
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 3
|
||||
%define stable_update 4
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -531,10 +531,6 @@ Patch432: bcm283x-VEC.patch
|
|||
# http://www.spinics.net/lists/dri-devel/msg132235.html
|
||||
Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
|
||||
|
||||
# Fix RPi3 from crashing. Nowhere near a final fix but provides breathing room while that is sorted
|
||||
# https://github.com/anholt/linux/issues/89
|
||||
Patch434: 0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
|
||||
|
||||
# Upstream fixes for i2c/serial/ethernet MAC addresses
|
||||
Patch435: bcm283x-fixes.patch
|
||||
|
||||
|
|
@ -615,9 +611,6 @@ Patch854: kvm-fix-page-struct-leak-in-handle_vmon.patch
|
|||
#CVE-2017-6353 rhbz 1428907 1428910
|
||||
Patch855: sctp-deny-peeloff-operation-on-asocs-with-threads-sl.patch
|
||||
|
||||
#CVE-2017-6874 rhbz 1432429 1432430
|
||||
Patch856: ucount-Remove-the-atomicity-from-ucount-count.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2187,6 +2180,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Mar 20 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.4-200
|
||||
- Linux v4.10.4
|
||||
|
||||
* Sun Mar 19 2017 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Add upstream patches to improve xgene_enet stability a little
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
|
||||
SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
|
||||
SHA512 (patch-4.10.3.xz) = ad297c3c9d52c15444bb76b3be6785a99219527614f39e84299f2121f2657377de4145a9a0c649b3719462c48e8aae8686267a521ad9e58a0372df117edf7594
|
||||
SHA512 (patch-4.10.4.xz) = a0631f3ee744984d9388d8e9ad98e7238d9305d94082db784b28080d9bae4f2c0cca84e4510ccfa562f5246ce1ed98c78cf41edc5a3b3bcc862ed62a1f2c8516
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
From 040757f738e13caaa9c5078bca79aa97e11dde88 Mon Sep 17 00:00:00 2001
|
||||
From: "Eric W. Biederman" <ebiederm@xmission.com>
|
||||
Date: Sun, 5 Mar 2017 15:03:22 -0600
|
||||
Subject: [PATCH] ucount: Remove the atomicity from ucount->count
|
||||
|
||||
Always increment/decrement ucount->count under the ucounts_lock. The
|
||||
increments are there already and moving the decrements there means the
|
||||
locking logic of the code is simpler. This simplification in the
|
||||
locking logic fixes a race between put_ucounts and get_ucounts that
|
||||
could result in a use-after-free because the count could go zero then
|
||||
be found by get_ucounts and then be freed by put_ucounts.
|
||||
|
||||
A bug presumably this one was found by a combination of syzkaller and
|
||||
KASAN. JongWhan Kim reported the syzkaller failure and Dmitry Vyukov
|
||||
spotted the race in the code.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Fixes: f6b2db1a3e8d ("userns: Make the count of user namespaces per user")
|
||||
Reported-by: JongHwan Kim <zzoru007@gmail.com>
|
||||
Reported-by: Dmitry Vyukov <dvyukov@google.com>
|
||||
Reviewed-by: Andrei Vagin <avagin@gmail.com>
|
||||
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
|
||||
---
|
||||
include/linux/user_namespace.h | 2 +-
|
||||
kernel/ucount.c | 18 +++++++++++-------
|
||||
2 files changed, 12 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
|
||||
index be76523..32354b4 100644
|
||||
--- a/include/linux/user_namespace.h
|
||||
+++ b/include/linux/user_namespace.h
|
||||
@@ -72,7 +72,7 @@ struct ucounts {
|
||||
struct hlist_node node;
|
||||
struct user_namespace *ns;
|
||||
kuid_t uid;
|
||||
- atomic_t count;
|
||||
+ int count;
|
||||
atomic_t ucount[UCOUNT_COUNTS];
|
||||
};
|
||||
|
||||
diff --git a/kernel/ucount.c b/kernel/ucount.c
|
||||
index 62630a4..b4eeee0 100644
|
||||
--- a/kernel/ucount.c
|
||||
+++ b/kernel/ucount.c
|
||||
@@ -144,7 +144,7 @@ static struct ucounts *get_ucounts(struct user_namespace *ns, kuid_t uid)
|
||||
|
||||
new->ns = ns;
|
||||
new->uid = uid;
|
||||
- atomic_set(&new->count, 0);
|
||||
+ new->count = 0;
|
||||
|
||||
spin_lock_irq(&ucounts_lock);
|
||||
ucounts = find_ucounts(ns, uid, hashent);
|
||||
@@ -155,8 +155,10 @@ static struct ucounts *get_ucounts(struct user_namespace *ns, kuid_t uid)
|
||||
ucounts = new;
|
||||
}
|
||||
}
|
||||
- if (!atomic_add_unless(&ucounts->count, 1, INT_MAX))
|
||||
+ if (ucounts->count == INT_MAX)
|
||||
ucounts = NULL;
|
||||
+ else
|
||||
+ ucounts->count += 1;
|
||||
spin_unlock_irq(&ucounts_lock);
|
||||
return ucounts;
|
||||
}
|
||||
@@ -165,13 +167,15 @@ static void put_ucounts(struct ucounts *ucounts)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
- if (atomic_dec_and_test(&ucounts->count)) {
|
||||
- spin_lock_irqsave(&ucounts_lock, flags);
|
||||
+ spin_lock_irqsave(&ucounts_lock, flags);
|
||||
+ ucounts->count -= 1;
|
||||
+ if (!ucounts->count)
|
||||
hlist_del_init(&ucounts->node);
|
||||
- spin_unlock_irqrestore(&ucounts_lock, flags);
|
||||
+ else
|
||||
+ ucounts = NULL;
|
||||
+ spin_unlock_irqrestore(&ucounts_lock, flags);
|
||||
|
||||
- kfree(ucounts);
|
||||
- }
|
||||
+ kfree(ucounts);
|
||||
}
|
||||
|
||||
static inline bool atomic_inc_below(atomic_t *v, int u)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
Loading…
Reference in New Issue