From patchwork Thu Jun 3 21:08:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brunner X-Patchwork-Id: 104172 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o53L8cNp009466 for ; Thu, 3 Jun 2010 21:08:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403Ab0FCVIh (ORCPT ); Thu, 3 Jun 2010 17:08:37 -0400 Received: from fg-out-1718.google.com ([72.14.220.158]:26462 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752752Ab0FCVIh (ORCPT ); Thu, 3 Jun 2010 17:08:37 -0400 Received: by fg-out-1718.google.com with SMTP id l26so2322412fgb.1 for ; Thu, 03 Jun 2010 14:08:36 -0700 (PDT) Received: by 10.87.68.36 with SMTP id v36mr16566650fgk.43.1275599315865; Thu, 03 Jun 2010 14:08:35 -0700 (PDT) Received: from chb-desktop (e181028009.adsl.alicedsl.de [85.181.28.9]) by mx.google.com with ESMTPS id 28sm666216fkx.36.2010.06.03.14.08.35 (version=SSLv3 cipher=RC4-MD5); Thu, 03 Jun 2010 14:08:35 -0700 (PDT) Date: Thu, 3 Jun 2010 23:08:31 +0200 From: Christian Brunner To: ceph-devel@vger.kernel.org Cc: kwolf@redhat.com Subject: [PATCH] qemu/rbd bugfix for create_tmap_op Message-ID: <20100603210831.GA17094@chb-desktop> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 03 Jun 2010 21:08:38 +0000 (UTC) diff --git a/block/rbd.c b/block/rbd.c index e4c4deb..74589cb 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -124,7 +124,7 @@ static int create_tmap_op(uint8_t op, const char *name, char **tmap_desc) uint32_t total_len = 1 + (sizeof(uint32_t) + len) + sizeof(uint32_t); char *desc = NULL; - qemu_malloc(total_len); + desc = qemu_malloc(total_len); *tmap_desc = desc;