Received: by 10.213.65.68 with SMTP id h4csp505475imn; Tue, 13 Mar 2018 11:09:45 -0700 (PDT) X-Google-Smtp-Source: AG47ELuf7CFCm9X9l7ES6fuCrQAGyenvoxHpT0SnckLABCMvuhMMRKrCrEP0lBLPZ+g4zu/klWzK X-Received: by 2002:a17:902:7401:: with SMTP id g1-v6mr1411904pll.4.1520964585352; Tue, 13 Mar 2018 11:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520964585; cv=none; d=google.com; s=arc-20160816; b=O2i91z6SG4Jvi7AH3vsyXCSiyqe+61JdUsLnkHbyb0LB0tUH35pYvHJKkfHzSPHE8n 83e9BtdiSSJR1YVn5up7ECNoajFSKKmtxkhyNbdlB4C5blTYGElbU6+EY4hZnEcXrSTI PQlE8rCAM08KNR1B2WVmRbdtTvWetj0ogjB32MB6MmEeOuOikNgcZJ9kXWpLSw1PIqmd sunn2F5TzJeMfqAWG63a8Ml4Zlbl7AHPBGzlEfyFfLwxMlzWdjk/5ztR9lBiRVXiAhnD EnpCsmQjUJFgmKoYqTpiSqYP0BjNyrgC16j79Hi6kFJnv816283q9Smj/GTTw9mHhGhO XbDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=w/qsJuVPlPXrRCDMNw1iNLnYGV+IZUYPirX1x/veRUc=; b=zVHOZLChDKrgtgxuQ4WrBMfnINQRbe8UTkvhYCjl67kqoE47auxdhM+FozNLe5PHgf zGjyG74ciQtt6LVpDQNv8ZBYe6K7NFgyHk25aysUZq4gm9cQVfVneRu2jJmC11qh3hm9 4hg5Y57e/zphSQHDH19kuDbzdRd9InF5xtF4JGnfSIanAL1nNoY8kTXzydqjgl19bBUb gs5rEX/yvCWpIPdUPfiqY5JuWQf8gS6Sz3UnPdmUYj3TI3aYXv59TyS0FiKbFsU7zx+Z ZYvnenlQcMkUvqWZeoLgT8owosayekSGsasS4hwGeDmvtgw2JXSTrDl9aCTPUnUsZKwF ZneQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=Bo6PyS5X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c66si498861pfc.416.2018.03.13.11.09.30; Tue, 13 Mar 2018 11:09:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=Bo6PyS5X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbeCMSH7 (ORCPT + 99 others); Tue, 13 Mar 2018 14:07:59 -0400 Received: from galahad.ideasonboard.com ([185.26.127.97]:41751 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbeCMSFp (ORCPT ); Tue, 13 Mar 2018 14:05:45 -0400 Received: from CookieMonster.cookiemonster.local (unknown [149.254.234.209]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id A3BCE20BEA; Tue, 13 Mar 2018 19:03:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1520964212; bh=qyR5mD69jBTMecQ7K1HzX/rytthafS+3me5mFQ6GHZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=Bo6PyS5Xa8BXTFIE5nZkKG5Y1Q7EkFmSdd/CPRdupkNtY7AWIaHvE4OwuQlSN+DYr mHl0ODTpmf6S7Gm5cb7l5qI7McMg5p2eIiPIaxVk/ocYWbezErRwdkmBo3PHzFh+cW 0cTBz4aebFN+lGpKwFZ8TQrc5thJBJZAGHa6OkwU= From: Kieran Bingham To: Laurent Pinchart , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org Cc: Kieran Bingham , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 05/11] media: vsp1: Clean up DLM objects on error Date: Tue, 13 Mar 2018 19:05:21 +0100 Message-Id: <0ae9f67a2dfb4e5268a968079def8da66c4b0d24.1520963956.git-series.kieran.bingham+renesas@ideasonboard.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If there is an error allocating a display list within a DLM object the existing display lists are not free'd, and neither is the DL body pool. Use the existing vsp1_dlm_destroy() function to clean up on error. Signed-off-by: Kieran Bingham --- drivers/media/platform/vsp1/vsp1_dl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c index 310ce81cd724..680eedb6fc9f 100644 --- a/drivers/media/platform/vsp1/vsp1_dl.c +++ b/drivers/media/platform/vsp1/vsp1_dl.c @@ -831,8 +831,10 @@ struct vsp1_dl_manager *vsp1_dlm_create(struct vsp1_device *vsp1, struct vsp1_dl_list *dl; dl = vsp1_dl_list_alloc(dlm, dlm->pool); - if (!dl) + if (!dl) { + vsp1_dlm_destroy(dlm); return NULL; + } list_add_tail(&dl->list, &dlm->free); } -- git-series 0.9.1