From patchwork Mon Aug 31 17:02:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 7100531 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EAEC2BEEC1 for ; Mon, 31 Aug 2015 17:02:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 326CF206E9 for ; Mon, 31 Aug 2015 17:02:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52938206E8 for ; Mon, 31 Aug 2015 17:02:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753886AbbHaRCx (ORCPT ); Mon, 31 Aug 2015 13:02:53 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:32815 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753340AbbHaRCx (ORCPT ); Mon, 31 Aug 2015 13:02:53 -0400 Received: by wicmc4 with SMTP id mc4so6578736wic.0 for ; Mon, 31 Aug 2015 10:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=W6bbOvQIo28B4WkAVZVdaDcG6sN0BT3zDg7LGNBrV/s=; b=GBkvoVY/sZ5rgTRh+wS4QV3AXthOCeqx16JLx7PurffEMDfA+0rO8HE5dGjY2nNPxX 28YoZ3pSX6uabNBRn3S5bYb7DxVloYpF/vB84YphGNQr/HgGssDdwIs2/MqSjF38iQQk 2PLINIR+IaYj7WGfccPJyDiKE+q0a23FW2ZnIzMX9bnzTgkZm31lKFEAE3+lTfBEkVYI 85kgowVbAzJl+FCvjGrnb/5KNaNTH7mTdAhgOMxGKnP27ioi2bNCmuX4LIRzOG3cxnjQ lZAM/LkD+pc2a+IKS/pVxSQLC9PsXYcHBCdK+WhgUo7IqYzdKygsn0JuxtVxwxcZ4ldc MKFg== X-Received: by 10.194.58.71 with SMTP id o7mr30077147wjq.82.1441040571773; Mon, 31 Aug 2015 10:02:51 -0700 (PDT) Received: from orange.local.localdomain ([109.110.66.71]) by smtp.gmail.com with ESMTPSA id lz10sm23031893wjb.48.2015.08.31.10.02.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Aug 2015 10:02:51 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: plug rbd_dev->header.object_prefix memory leak Date: Mon, 31 Aug 2015 20:02:38 +0300 Message-Id: <1441040558-8977-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.9.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Need to free object_prefix when rbd_dev_v2_snap_context() fails, but only if this is the first time we are reading in the header. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- drivers/block/rbd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 324bf35ec4dd..69d03aa46d0d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4720,7 +4720,10 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev) } ret = rbd_dev_v2_snap_context(rbd_dev); - dout("rbd_dev_v2_snap_context returned %d\n", ret); + if (ret && first_time) { + kfree(rbd_dev->header.object_prefix); + rbd_dev->header.object_prefix = NULL; + } return ret; }