Linux v4.8.7
This commit is contained in:
parent
d48f3a76cc
commit
053da0f7ce
|
@ -1,39 +0,0 @@
|
|||
From 5c33677c87cbe44ae04df69c4a29c1750a9ec4e5 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Whitcroft <apw@canonical.com>
|
||||
Date: Tue, 11 Oct 2016 15:16:57 +0100
|
||||
Subject: [PATCH] dm raid: fix compat_features validation
|
||||
|
||||
In ecbfb9f118bce4 ("dm raid: add raid level takeover support") a new
|
||||
compatible feature flag was added. Validation for these compat_features
|
||||
was added but this only passes for new raid mappings with this feature
|
||||
flag. This causes previously created raid mappings to be failed at
|
||||
import.
|
||||
|
||||
Check compat_features for the only valid combination.
|
||||
|
||||
Fixes: ecbfb9f118bce4 ("dm raid: add raid level takeover support")
|
||||
Cc: stable@vger.kernel.org # v4.8
|
||||
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||||
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
|
||||
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
|
||||
---
|
||||
drivers/md/dm-raid.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
|
||||
index 8abde6b..2a39700 100644
|
||||
--- a/drivers/md/dm-raid.c
|
||||
+++ b/drivers/md/dm-raid.c
|
||||
@@ -2258,7 +2258,8 @@ static int super_validate(struct raid_set *rs, struct md_rdev *rdev)
|
||||
if (!mddev->events && super_init_validation(rs, rdev))
|
||||
return -EINVAL;
|
||||
|
||||
- if (le32_to_cpu(sb->compat_features) != FEATURE_FLAG_SUPPORTS_V190) {
|
||||
+ if (le32_to_cpu(sb->compat_features) &&
|
||||
+ le32_to_cpu(sb->compat_features) != FEATURE_FLAG_SUPPORTS_V190) {
|
||||
rs->ti->error = "Unable to assemble array: Unknown flag(s) in compatible feature flags";
|
||||
return -EINVAL;
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
11
kernel.spec
11
kernel.spec
|
@ -42,7 +42,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 301
|
||||
%global baserelease 300
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 6
|
||||
%define stable_update 7
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
@ -637,9 +637,6 @@ Patch850: v3-vfio-pci-Fix-integer-overflows-bitmask-check.patch
|
|||
#rhbz 1325354
|
||||
Patch852: 0001-HID-input-ignore-System-Control-application-usages-i.patch
|
||||
|
||||
#rhbz 1391279
|
||||
Patch853: 0001-dm-raid-fix-compat_features-validation.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -2176,6 +2173,10 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu Nov 10 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.7-300
|
||||
- Linux v4.8.7
|
||||
- Fixes cve-2016-8630 (rhbz 1393350 1393358)
|
||||
|
||||
* Wed Nov 2 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.6-301
|
||||
- dm raid: fix compat_features validation (rhbz 1391279)
|
||||
|
||||
|
|
Loading…
Reference in New Issue