From: NeilBrown <neilb@suse.de>
To: Lukasz Dorau <lukasz.dorau@intel.com>
Cc: linux-raid@vger.kernel.org, maciej.patelczyk@intel.com,
ed.ciechanowski@intel.com, Jacek.Danecki@intel.com
Subject: Re: [PATCH] fix segfaults in Detail()
Date: Thu, 20 Sep 2012 11:06:44 +1000 [thread overview]
Message-ID: <20120920110644.463c2fd9@notabene.brown> (raw)
In-Reply-To: <20120906154119.754.88103.stgit@gklab-128-085.igk.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]
On Thu, 06 Sep 2012 17:41:19 +0200 Lukasz Dorau <lukasz.dorau@intel.com>
wrote:
> If disk has been removed, 'st' and 'info' can be NULL. It causes segfault.
> 'st' and 'info' should be checked against being NULL before being used.
>
> Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
> ---
> Detail.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Detail.c b/Detail.c
> index 17aa516..79b1047 100644
> --- a/Detail.c
> +++ b/Detail.c
> @@ -430,7 +430,7 @@ int Detail(char *dev, struct context *c)
> }
> free_mdstat(ms);
>
> - if (st->sb && info->reshape_active) {
> + if ((st && st->sb) && (info && info->reshape_active)) {
> #if 0
> This is pretty boring
> printf(" Reshape pos'n : %llu%s\n", (unsigned long long) info->reshape_progress<<9,
> @@ -596,7 +596,8 @@ This is pretty boring
> if (spares && c->brief && array.raid_disks) printf(" spares=%d", spares);
> if (c->brief && st && st->sb)
> st->ss->brief_detail_super(st);
> - st->ss->free_super(st);
> + if (st && st->ss)
> + st->ss->free_super(st);
>
> if (c->brief > 1 && devices) printf("\n devices=%s", devices);
> if (c->brief)
>
applied, thanks.
Though I removed the test on 'st->ss' - that is never NULL.
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
prev parent reply other threads:[~2012-09-20 1:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 15:41 [PATCH] fix segfaults in Detail() Lukasz Dorau
2012-09-13 10:04 ` Dorau, Lukasz
2012-09-20 1:06 ` NeilBrown [this message]
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=20120920110644.463c2fd9@notabene.brown \
--to=neilb@suse.de \
--cc=Jacek.Danecki@intel.com \
--cc=ed.ciechanowski@intel.com \
--cc=linux-raid@vger.kernel.org \
--cc=lukasz.dorau@intel.com \
--cc=maciej.patelczyk@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).