From patchwork Fri Apr 26 12:06:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2493251 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7D7063FC64 for ; Fri, 26 Apr 2013 12:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754761Ab3DZMGo (ORCPT ); Fri, 26 Apr 2013 08:06:44 -0400 Received: from mail-ia0-f180.google.com ([209.85.210.180]:42566 "EHLO mail-ia0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754141Ab3DZMGm (ORCPT ); Fri, 26 Apr 2013 08:06:42 -0400 Received: by mail-ia0-f180.google.com with SMTP id t4so2580454iag.25 for ; Fri, 26 Apr 2013 05:06:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=inHzU55vGmHbWV52ZHmktOCcvU8AlouEQ4gl05EgPSM=; b=GKE5kXphUhzOlyx9XoxXo4a9myEaR9H2kFWZQqBJ7hugN+rzKSJRTpeww3IFPtCSMY D5oX2BKjT6NW1ZT0Z0boOiND4D6d7LjBvIgZefYthBdBRj5OBN2bcn+43iJ4BHTNEz4r DtGZ7X5Cg3yTsZl1rMg6Dm3aKBgpTf0Kt1+BTRodIR1s3IL66zHipON/wPAth2WQrgDD dx4Y8GrS8V55X2vb0N717UlUMRqv85fpY0eIeh646H+OGkCBdy21KfP1RfEjiPQkrrKi F20WqWZS38u6hMfSS7B0DdCVE+pd1FLRBxiJk3/NZ1ts4bI97xu2B9NweeaOxx8FXyUf MelQ== X-Received: by 10.42.126.133 with SMTP id e5mr24089890ics.17.1366978002204; Fri, 26 Apr 2013 05:06:42 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id qn10sm2544879igc.6.2013.04.26.05.06.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Apr 2013 05:06:41 -0700 (PDT) Message-ID: <517A6DD1.2080102@inktank.com> Date: Fri, 26 Apr 2013 07:06:41 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 5/6] rbd: fix leak of format 2 snapshot names References: <517A6D39.80000@inktank.com> In-Reply-To: <517A6D39.80000@inktank.com> X-Gm-Message-State: ALoCoQnYr1sP5m3oRZgxhuqiUFt3tg1AOuxFE7Zluiw5jnOn0FEJgXIe0fSeheglchTSC7dwpKRa Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org When the snapshot context for an rbd device gets updated (or the initial one is recorded) a a list of snapshot structures is created to represent them, one entry per snapshot. Each entry includes a dynamically-allocated copy of the snapshot name. Currently the name is allocated in rbd_snap_create(), as a duplicate of the passed-in name. For format 1 images, the snapshot name provided is just a pointer to an existing name. But for format 2 images, the passed-in name is already dynamically allocated, and in the the process of duplicating it here we are leaking the passed-in name. Fix this by dynamically allocating the name for format 1 snapshots also, and then stop allocating a duplicate in rbd_snap_create(). Change rbd_dev_v1_snap_info() so none of its parameters is side-effected unless it's going to return success. This is part of: http://tracker.ceph.com/issues/4803 Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) { @@ -3458,15 +3451,19 @@ static char *rbd_dev_v1_snap_info(struct rbd_device *rbd_dev, u32 which, rbd_assert(which < rbd_dev->header.snapc->num_snaps); - *snap_size = rbd_dev->header.snap_sizes[which]; - *snap_features = 0; /* No features for v1 */ - /* Skip over names until we find the one we are looking for */ snap_name = rbd_dev->header.snap_names; while (which--) snap_name += strlen(snap_name) + 1; + snap_name = kstrdup(snap_name, GFP_KERNEL); + if (!snap_name); + return ERR_PTR(-ENOMEM); + + *snap_size = rbd_dev->header.snap_sizes[which]; + *snap_features = 0; /* No features for v1 */ + return snap_name; } diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 916741b..2b5ba50 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3427,30 +3427,23 @@ static struct rbd_snap *rbd_snap_create(struct rbd_device *rbd_dev, u64 snap_features) { struct rbd_snap *snap; - int ret; snap = kzalloc(sizeof (*snap), GFP_KERNEL); if (!snap) return ERR_PTR(-ENOMEM); - ret = -ENOMEM; - snap->name = kstrdup(snap_name, GFP_KERNEL); - if (!snap->name) - goto err; - + snap->name = snap_name; snap->id = snap_id; snap->size = snap_size; snap->features = snap_features; return snap; - -err: - kfree(snap->name); - kfree(snap); - - return ERR_PTR(ret); } +/* + * Returns a dynamically-allocated snapshot name if successful, or a + * pointer-coded error otherwise. + */ static char *rbd_dev_v1_snap_info(struct rbd_device *rbd_dev, u32 which, u64 *snap_size, u64 *snap_features)