From: Dan Carpenter <dan.carpenter@oracle.com>
To: Shaohua Li <shli@kernel.org>,
Krzysztof Wojcik <krzysztof.wojcik@intel.com>
Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [patch] md/raid0: check for create_strip_zones() errors
Date: Wed, 13 Apr 2016 06:46:45 +0000 [thread overview]
Message-ID: <20160413064645.GH8092@mwanda> (raw)
My static checker complains that if create_strip_zones() fails then we
use "priv_conf" without initializing it. Fix this by checking for
failure.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 2ea12c6..1d80e3c 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -507,6 +507,7 @@ static void *raid0_takeover_raid45(struct mddev *mddev)
{
struct md_rdev *rdev;
struct r0conf *priv_conf;
+ int ret;
if (mddev->degraded != 1) {
printk(KERN_ERR "md/raid0:%s: raid5 must be degraded! Degraded disks: %d\n",
@@ -534,13 +535,16 @@ static void *raid0_takeover_raid45(struct mddev *mddev)
/* make sure it will be not marked as dirty */
mddev->recovery_cp = MaxSector;
- create_strip_zones(mddev, &priv_conf);
+ ret = create_strip_zones(mddev, &priv_conf);
+ if (ret)
+ return ERR_PTR(ret);
return priv_conf;
}
static void *raid0_takeover_raid10(struct mddev *mddev)
{
struct r0conf *priv_conf;
+ int ret;
/* Check layout:
* - far_copies must be 1
@@ -575,7 +579,9 @@ static void *raid0_takeover_raid10(struct mddev *mddev)
/* make sure it will be not marked as dirty */
mddev->recovery_cp = MaxSector;
- create_strip_zones(mddev, &priv_conf);
+ ret = create_strip_zones(mddev, &priv_conf);
+ if (ret)
+ return ERR_PTR(ret);
return priv_conf;
}
@@ -583,6 +589,7 @@ static void *raid0_takeover_raid1(struct mddev *mddev)
{
struct r0conf *priv_conf;
int chunksect;
+ int ret;
/* Check layout:
* - (N - 1) mirror drives must be already faulty
@@ -617,7 +624,9 @@ static void *raid0_takeover_raid1(struct mddev *mddev)
/* make sure it will be not marked as dirty */
mddev->recovery_cp = MaxSector;
- create_strip_zones(mddev, &priv_conf);
+ ret = create_strip_zones(mddev, &priv_conf);
+ if (ret)
+ return ERR_PTR(ret);
return priv_conf;
}
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Shaohua Li <shli@kernel.org>,
Krzysztof Wojcik <krzysztof.wojcik@intel.com>
Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [patch] md/raid0: check for create_strip_zones() errors
Date: Wed, 13 Apr 2016 09:46:45 +0300 [thread overview]
Message-ID: <20160413064645.GH8092@mwanda> (raw)
My static checker complains that if create_strip_zones() fails then we
use "priv_conf" without initializing it. Fix this by checking for
failure.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 2ea12c6..1d80e3c 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -507,6 +507,7 @@ static void *raid0_takeover_raid45(struct mddev *mddev)
{
struct md_rdev *rdev;
struct r0conf *priv_conf;
+ int ret;
if (mddev->degraded != 1) {
printk(KERN_ERR "md/raid0:%s: raid5 must be degraded! Degraded disks: %d\n",
@@ -534,13 +535,16 @@ static void *raid0_takeover_raid45(struct mddev *mddev)
/* make sure it will be not marked as dirty */
mddev->recovery_cp = MaxSector;
- create_strip_zones(mddev, &priv_conf);
+ ret = create_strip_zones(mddev, &priv_conf);
+ if (ret)
+ return ERR_PTR(ret);
return priv_conf;
}
static void *raid0_takeover_raid10(struct mddev *mddev)
{
struct r0conf *priv_conf;
+ int ret;
/* Check layout:
* - far_copies must be 1
@@ -575,7 +579,9 @@ static void *raid0_takeover_raid10(struct mddev *mddev)
/* make sure it will be not marked as dirty */
mddev->recovery_cp = MaxSector;
- create_strip_zones(mddev, &priv_conf);
+ ret = create_strip_zones(mddev, &priv_conf);
+ if (ret)
+ return ERR_PTR(ret);
return priv_conf;
}
@@ -583,6 +589,7 @@ static void *raid0_takeover_raid1(struct mddev *mddev)
{
struct r0conf *priv_conf;
int chunksect;
+ int ret;
/* Check layout:
* - (N - 1) mirror drives must be already faulty
@@ -617,7 +624,9 @@ static void *raid0_takeover_raid1(struct mddev *mddev)
/* make sure it will be not marked as dirty */
mddev->recovery_cp = MaxSector;
- create_strip_zones(mddev, &priv_conf);
+ ret = create_strip_zones(mddev, &priv_conf);
+ if (ret)
+ return ERR_PTR(ret);
return priv_conf;
}
next reply other threads:[~2016-04-13 6:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 6:46 Dan Carpenter [this message]
2016-04-13 6:46 ` [patch] md/raid0: check for create_strip_zones() errors Dan Carpenter
2016-04-13 17:02 ` Shaohua Li
2016-04-13 17:02 ` Shaohua Li
2016-04-13 17:53 ` Dan Carpenter
2016-04-13 17:53 ` Dan Carpenter
2016-04-14 9:31 ` [patch v2] md/raid0: fix uninitialized variable bug Dan Carpenter
2016-04-14 9:31 ` Dan Carpenter
2016-04-14 16:57 ` Shaohua Li
2016-04-14 16:57 ` Shaohua Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160413064645.GH8092@mwanda \
--to=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=krzysztof.wojcik@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=shli@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.