linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jes.Sorensen@redhat.com
To: neilb@suse.de
Cc: linux-raid@vger.kernel.org
Subject: [PATCH 04/13] Attempt to catch malloc() failure in Detail.c
Date: Wed, 26 Oct 2011 17:30:17 +0200	[thread overview]
Message-ID: <1319643026-11501-5-git-send-email-Jes.Sorensen@redhat.com> (raw)
In-Reply-To: <1319643026-11501-1-git-send-email-Jes.Sorensen@redhat.com>

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 Detail.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/Detail.c b/Detail.c
index ca34abe..4130821 100644
--- a/Detail.c
+++ b/Detail.c
@@ -147,6 +147,11 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
 			info = st->ss->container_content(st, subarray);
 		else {
 			info = malloc(sizeof(*info));
+			if (!info) {
+				fprintf(stderr, Name ": %s unable to allocate "
+					"memory\n", __func__);
+				return -ENOMEM;
+			}
 			st->ss->getinfo_super(st, info, NULL);
 		}
 		if (!info)
@@ -227,6 +232,11 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
 	}
 
 	disks = malloc(max_disks * sizeof(mdu_disk_info_t));
+	if (!disks) {
+		fprintf(stderr, Name ": %s unable to allocate memory\n",
+			__func__);
+		return -ENOMEM;
+	}
 	for (d=0; d<max_disks; d++) {
 		disks[d].state = (1<<MD_DISK_REMOVED);
 		disks[d].major = disks[d].minor = 0;
@@ -252,6 +262,11 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
 	}
 
 	avail = calloc(array.raid_disks, 1);
+	if (!avail) {
+		fprintf(stderr, Name ": %s unable to allocate memory\n",
+			__func__);
+		return -ENOMEM;
+	}
 
 	for (d= 0; d < array.raid_disks; d++) {
 		mdu_disk_info_t disk = disks[d];
@@ -563,6 +578,13 @@ This is pretty boring
 				if (devices) {
 					devices = realloc(devices,
 							  strlen(devices)+1+strlen(dv)+1);
+					if (!devices) {
+						fprintf(stderr, Name ": %s "
+							"unable to realloc "
+							"memory\n", __func__);
+						return -ENOMEM;
+					}
+
 					strcat(strcat(devices,","),dv);
 				} else
 					devices = strdup(dv);
-- 
1.7.6.4


  parent reply	other threads:[~2011-10-26 15:30 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-26 15:30 [PATCH 00/13] Add missing handling of malloc() failure Jes.Sorensen
2011-10-26 15:30 ` [PATCH 01/13] count_active() catch " Jes.Sorensen
2011-10-26 15:30 ` [PATCH 02/13] Catch malloc() failures Jes.Sorensen
2011-10-26 15:30 ` [PATCH 03/13] Try to catch malloc() failures in Assemble.c Jes.Sorensen
2011-10-26 15:30 ` Jes.Sorensen [this message]
2011-10-26 15:30 ` [PATCH 05/13] Handle malloc() failure in Examine.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 06/13] Handle malloc() errors in Manage.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 07/13] Fix malloc() failure handling in Monitor.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 08/13] Handle malloc() failures in devline() Jes.Sorensen
2011-10-26 15:30 ` [PATCH 09/13] Fix malloc handling in dlink.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 10/13] Handle malloc() failure in Grow.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 11/13] Handle malloc() failure in mdopen.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 12/13] Handle malloc() failure in mdstat.c Jes.Sorensen
2011-10-26 15:30 ` [PATCH 13/13] Catch malloc() failure Jes.Sorensen
2011-10-27  4:49 ` [PATCH 00/13] Add missing handling of " NeilBrown
2011-10-27  7:39   ` Jes Sorensen

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=1319643026-11501-5-git-send-email-Jes.Sorensen@redhat.com \
    --to=jes.sorensen@redhat.com \
    --cc=linux-raid@vger.kernel.org \
    --cc=neilb@suse.de \
    /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).