diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-11-03 09:15:33 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-11-03 09:15:33 -0500 |
| commit | 342125282e9bb1b6e773249b1e619cb48f1dde3d (patch) | |
| tree | 3fa6a8bbf18c63e403ec67e10c19f4eb39a6db41 | |
| parent | 42d48f176610c4cd963807f92a6004dec584a1bd (diff) | |
| download | kernel-342125282e9bb1b6e773249b1e619cb48f1dde3d.tar.gz kernel-342125282e9bb1b6e773249b1e619cb48f1dde3d.tar.xz kernel-342125282e9bb1b6e773249b1e619cb48f1dde3d.zip | |
dm raid: fix compat_features validation (rhbz 1391279)
| -rw-r--r-- | 0001-dm-raid-fix-compat_features-validation.patch | 39 | ||||
| -rw-r--r-- | kernel.spec | 8 |
2 files changed, 46 insertions, 1 deletions
diff --git a/0001-dm-raid-fix-compat_features-validation.patch b/0001-dm-raid-fix-compat_features-validation.patch new file mode 100644 index 000000000..c418f2632 --- /dev/null +++ b/0001-dm-raid-fix-compat_features-validation.patch @@ -0,0 +1,39 @@ +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 + diff --git a/kernel.spec b/kernel.spec index 2ef4ec217..7e572d887 100644 --- a/kernel.spec +++ b/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 200 +%global baserelease 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -632,6 +632,9 @@ 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 @@ -2159,6 +2162,9 @@ fi # # %changelog +* Wed Nov 2 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.6-201 +- dm raid: fix compat_features validation (rhbz 1391279) + * Tue Nov 1 2016 Peter Robinson <pbrobinson@fedoraproject.org> - Linux v4.8.6 - Fixes for omap4 (panda board) |