[yakkety/master-next,1/1] dm raid: fix compat_features validation
diff mbox

Message ID 20161012091230.21769-2-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft Oct. 12, 2016, 9:12 a.m. UTC
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>

BugLink: http://bugs.launchpad.net/bugs/1631298
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 drivers/md/dm-raid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Stefan Bader Oct. 12, 2016, 9:19 a.m. UTC | #1
On 12.10.2016 11:12, Andy Whitcroft wrote:
> 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>
> 
> BugLink: http://bugs.launchpad.net/bugs/1631298
> Signed-off-by: Andy Whitcroft <apw@canonical.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) {

Looks ok for no flag set and for the case of the one currently supported.

>  		rs->ti->error = "Unable to assemble array: Unknown flag(s) in compatible feature flags";
>  		return -EINVAL;
>  	}
>
Colin Ian King Oct. 12, 2016, 9:20 a.m. UTC | #2
On 12/10/16 10:12, Andy Whitcroft wrote:
> 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>
> 
> BugLink: http://bugs.launchpad.net/bugs/1631298
> Signed-off-by: Andy Whitcroft <apw@canonical.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;
>  	}
> 
Seems like a legit fix to me.

Acked-by: Colin Ian King <colin.king@canonical.com>
Seth Forshee Oct. 12, 2016, 4:34 p.m. UTC | #3

Patch
diff mbox

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;
 	}