From patchwork Sun Jun 30 11:51:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 2804451 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7128C9F756 for ; Sun, 30 Jun 2013 11:53:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9913420109 for ; Sun, 30 Jun 2013 11:53:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D7D820108 for ; Sun, 30 Jun 2013 11:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751276Ab3F3LxI (ORCPT ); Sun, 30 Jun 2013 07:53:08 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:45753 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750813Ab3F3LxG (ORCPT ); Sun, 30 Jun 2013 07:53:06 -0400 Received: by mail-wi0-f178.google.com with SMTP id k10so2231259wiv.5 for ; Sun, 30 Jun 2013 04:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=q6RFaUNPkafgoPv1ec5RuzbXEz1gUa2zId6g833YqM8=; b=IG6C7GWTx4p7fPlbTan3SQTWcfjrhRsGuluirJKYqpgAZvu5kSnKEEXK023i5WoPMx jDCJL9Ylw929LDYk5gbZBgXB7L0U5uy9RZMzXlo/UP4qsWJ9lKy5s6ua3Bn9lfpz8nEs zMS2zVqWjkbcODY24e16J+KYBZQnwu2+QnUM0QjRCt4eGPRKoH3/aVJI6SUAbTVYRGG6 thCLMJ51s8V/l8VjHNzjjAddZ6yLiPUIDNAazYxP11AihE+T7EehenDEocnjS+9GvK9C RsbPLpevHmstQJBrlfwPcuOqq8mKrkdhcw9KtuOigWt8Nz3qU6IiPNMd3Tj/tUM/oJHM xguA== X-Received: by 10.180.187.209 with SMTP id fu17mr9362355wic.52.1372593184862; Sun, 30 Jun 2013 04:53:04 -0700 (PDT) Received: from storm-desktop.lan (bl11-92-143.dsl.telepac.pt. [85.244.92.143]) by mx.google.com with ESMTPSA id z6sm9396421wiv.11.2013.06.30.04.53.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Jun 2013 04:53:04 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH 2/3] Btrfs-progs: add kstrdup() return value check Date: Sun, 30 Jun 2013 12:51:45 +0100 Message-Id: <1372593106-6593-3-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372593106-6593-1-git-send-email-fdmanana@gmail.com> References: <1372593106-6593-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 =