linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Filipe David Borba Manana <fdmanana@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Filipe David Borba Manana <fdmanana@gmail.com>
Subject: [PATCH 2/3] Btrfs-progs: add kstrdup() return value check
Date: Sun, 30 Jun 2013 12:51:45 +0100	[thread overview]
Message-ID: <1372593106-6593-3-git-send-email-fdmanana@gmail.com> (raw)
In-Reply-To: <1372593106-6593-1-git-send-email-fdmanana@gmail.com>

When allocating a btrfs_device structure, device_list_add()
in volumes.c was not checking if the call to duplicate the
label string succeeded or not.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
 volumes.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/volumes.c b/volumes.c
index d6f81f8..ea1d401 100644
--- a/volumes.c
+++ b/volumes.c
@@ -125,6 +125,11 @@ static int device_list_add(const char *path,
 			return -ENOMEM;
 		}
 		device->label = kstrdup(disk_super->label, GFP_NOFS);
+		if (!device->label) {
+			kfree(device->name);
+			kfree(device);
+			return -ENOMEM;
+		}
 		device->total_devs = btrfs_super_num_devices(disk_super);
 		device->super_bytes_used = btrfs_super_bytes_used(disk_super);
 		device->total_bytes =
-- 
1.7.9.5


  parent reply	other threads:[~2013-06-30 11:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-30 11:51 [PATCH 0/3] Small fixes for btrfs-progs Filipe David Borba Manana
2013-06-30 11:51 ` [PATCH 1/3] Btrfs-progs: add missing write check for mkfs Filipe David Borba Manana
2013-07-03 17:09   ` David Sterba
2013-07-03 17:25     ` Filipe David Manana
2013-07-03 21:12       ` David Sterba
2013-06-30 11:51 ` Filipe David Borba Manana [this message]
2013-06-30 11:51 ` [PATCH 3/3] Btrfs-progs: remove unused code Filipe David Borba Manana
2013-07-01  8:21   ` Anand Jain
2013-07-03 17:30 ` [PATCH v2 1/3] Btrfs-progs: add missing write check for mkfs Filipe David Borba Manana
2013-07-03 17:32 ` [PATCH v2 3/3] Btrfs-progs: remove unused code Filipe David Borba Manana
2013-07-04  9:48 ` [PATCH v2 0/5] Small fixes for btrfs-progs Filipe David Borba Manana
2013-07-04  9:48   ` [PATCH 4/5] Btrfs-progs: return error on write failure in make_btrfs() Filipe David Borba Manana
2013-08-08 10:52     ` Stefan Behrens
2013-08-08 10:56       ` Filipe David Manana
2013-07-04  9:48   ` [PATCH 5/5] Btrfs-progs: don't ignore errors in btrfs_add_block_group() Filipe David Borba Manana
2013-07-08 13:21 ` [PATCH v2 5/5] Btrfs-progs: don't ignore errors in extent-tree.c Filipe David Borba Manana

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=1372593106-6593-3-git-send-email-fdmanana@gmail.com \
    --to=fdmanana@gmail.com \
    --cc=linux-btrfs@vger.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 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).