From patchwork Mon Aug 31 12:47:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 7099681 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 4D3A7BEEC1 for ; Mon, 31 Aug 2015 12:47:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F3DA205BD for ; Mon, 31 Aug 2015 12:47:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 900C0205BC for ; Mon, 31 Aug 2015 12:47:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752967AbbHaMrr (ORCPT ); Mon, 31 Aug 2015 08:47:47 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:34761 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752668AbbHaMrq (ORCPT ); Mon, 31 Aug 2015 08:47:46 -0400 Received: by widfa3 with SMTP id fa3so23882317wid.1 for ; Mon, 31 Aug 2015 05:47:45 -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=/jXRzQcapJKcVXTaGH7dGiBx5XlblE9pUR2EzN2EkC8=; b=kYDco1qAItHCVth57kJbuRpg4ztLyOm19LpJ74lPmnbVCpsCF5UBQIxnq8LlVYoSdJ I2l0ax5g/CcnMYZHYKKrsqvSqT8LlHrZdm4aA6EtT2SNTJHha80CrYBIGYd7m97wVZPI LgD5gE1rh1QvwQIM/XzoRzJ5mIBXPE+IMbypD8RMs0rAOXJndIcKr4NzLTAxpitqu2mj CUp7VnXXHRxkbrpo1g56JaqAgi1OiXS+Qr7ksQYAlIknNM3i5+14qgTmzDybyroFsS7Z kZIq0R1195W9T9WOrcxPNW78vrFNk9933ZGKTg8y7rennOaSkEpxR18cB9ZpyK9ybJDR eWPg== X-Received: by 10.180.81.70 with SMTP id y6mr18645013wix.36.1441025265487; Mon, 31 Aug 2015 05:47:45 -0700 (PDT) Received: from orange.local.localdomain ([109.110.67.18]) by smtp.gmail.com with ESMTPSA id w8sm17928143wiy.10.2015.08.31.05.47.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Aug 2015 05:47:44 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: fix double free on rbd_dev->header_name Date: Mon, 31 Aug 2015 15:47:28 +0300 Message-Id: <1441025248-50599-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 If rbd_dev_image_probe() in rbd_dev_probe_parent() fails, header_name is freed twice: once in rbd_dev_probe_parent() and then in its caller rbd_dev_image_probe() (rbd_dev_image_probe() is called recursively to handle parent images). rbd_dev_probe_parent() is responsible for probing the parent, so it shoudn't mock with clone's fields. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- drivers/block/rbd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index bc67a93aa4f4..324bf35ec4dd 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5201,7 +5201,6 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev) out_err: if (parent) { rbd_dev_unparent(rbd_dev); - kfree(rbd_dev->header_name); rbd_dev_destroy(parent); } else { rbd_put_client(rbdc);